54db9ded4d
Moved janitorial sign in a new weapons/miscellaneous.dm
...
Made holosign_creator/afterattack() a bit better.
Fixed merge conflict fixing error.
Fixes typos in holosign_creator.dm
2016-02-22 01:44:53 +01:00
2ec892a1fc
Merge branch 'master' of https://github.com/tgstation/-tg-station into Holobarrier
...
Conflicts:
icons/effects/effects.dmi
2016-02-22 01:34:20 +01:00
1485297a64
Fixes dme, can't store knife
2016-02-20 14:57:06 -06:00
83ec0ed002
Merge remote-tracking branch 'refs/remotes/tgstation/master' into techno_alchemist
...
# Conflicts:
# icons/mob/inhands/items_lefthand.dmi
# icons/mob/inhands/items_righthand.dmi
2016-02-20 14:49:30 -06:00
61666cca3a
Forgot to handle damage from thrown weapons.
2016-02-19 03:05:50 +01:00
1ec9f757cc
Merge pull request #15591 from Lobachevskiy/telebaton-fix
...
Fix police and telebatons ignoring shields
2016-02-18 19:49:54 -06:00
8b2708ff9a
Replaces holo tape and holo tape projector with holo barrier and holo barrier projector (children of the janitor's holosign creator).
2016-02-19 02:34:57 +01:00
56d2a34201
Splits beds and chairs
...
Adds deconstruct structure helper
Moves chair sprites from objects.dmi to chairs.dmi
Fixes check shields passing proper flags on unarmed attacks
Makes stools and chairs able to be picked up
2016-02-18 17:55:38 +01:00
633cb4d1a3
Bo staff fix
2016-02-17 23:05:25 -06:00
9992a7cc7d
Tribal Knife
2016-02-17 22:37:23 -06:00
0d8a181ee7
Knife
2016-02-17 22:33:33 -06:00
cfcecba389
Merge pull request #15575 from phil235/ReviveFix1
...
Fixes mob revival
2016-02-17 20:42:10 -06:00
bb00bd311f
Merge pull request #15513 from KorPhaeron/chaplain3
...
Four more holy weapons
2016-02-17 19:48:06 -06:00
43207c3070
Fix police and telebatons ignoring shields
2016-02-18 02:57:32 +04:00
7c0c66dba3
Merge remote-tracking branch 'upstream/master' into urange
2016-02-17 14:21:29 +00:00
7e1efca13a
Created two new procs to handle reviving mobs more easily:
...
- can_be_revived(), used so we don't revive a mob who would immediately die again (lack of brain organ for carbons).
- fully_heal(), called by revive when we want to completely heal a mob before trying to ressuscitate it.
I gave some arguments to revive() so the proc can be used by more than just the admin healing code (ai revived by the AI fixer console, drone revived by another drone clicking it, strange reagent ressuscitating you, borg revived by restart circuitboard, changeling using his revive ability, etc)
This fixes borg revival not updating its vision correctly and not updating the diagnostic HUD. Same fix for changeling revival.
2016-02-16 23:27:08 +01:00
fbc55d391a
Removes silly references
2016-02-15 04:14:27 -06:00
e8426a26da
Merge pull request #15505 from ChangelingRain/sleeplesscarp
...
Sleeping carp gang no longer has special equipment
2016-02-15 03:05:04 +00:00
e6dbea2184
More holy weapons
2016-02-13 21:42:36 -06:00
7c183d448e
Sleeping carp gang no longer has special interactions.
2016-02-13 18:17:01 -05:00
c52a3e88d4
Merge pull request #15447 from KorPhaeron/holy_weapons
...
Three more chaplain weapons
2016-02-13 17:29:47 -03:00
e7af997785
Merge pull request #15441 from phil235/BrainChanges
...
Brain fixes and changes
2016-02-13 13:29:37 -03:00
b230117223
Merge pull request #15439 from Malkevin/implants2
...
Tracking Implants
2016-02-13 00:17:09 -03:00
f0aae210c7
Merge pull request #15370 from PKPenguin321/patch-16
...
Separates Traitor EMP Flashlights from the EMP Kit, reduces TC prices (Remake)
2016-02-12 19:13:05 -06:00
74e8bbf029
Fixes defibbed corpse not getting blind overlay despite being in crit.
...
Brain mobs that are beaten to death can still be inserted inside a brainless human corpse but defibbing the corpse cannot work (the brain is too damaged). On the other hand cloning that corpse will still work.
Deffibing a brainless corpse no longer gives "further attempts may be successful".
Fixes brain mob's container var not being nullified on Destroy().
2016-02-12 21:47:22 +01:00
dbeec9a194
Merge pull request #15402 from octareenroon91/FIX-SORD-FIX
...
Refactor suicide
2016-02-12 16:49:06 +01:00
80721379b4
Three more chaplain weapons
2016-02-11 21:45:19 -06:00
72184c4ae8
Balls to it, it compiles and I know I checked if it was still used last year... probably.
2016-02-12 00:43:55 +00:00
f234cdb919
Removed a redundant line in the tracking implant implant pad description.
2016-02-12 00:31:27 +00:00
457b739e28
Merge branch 'master' of https://github.com/tgstation/-tg-station into implants
...
Conflicts:
code/game/machinery/computer/prisoner.dm
code/game/objects/items/weapons/implants/implant.dm
2016-02-11 23:41:57 +00:00
9ecaac979a
Tracking implants
...
Removes the clunky unintuitive ID number system from tracking implants and replaces it to show the mob's name, as chemical implants already did, and the teleporter already did re: trackers
This is on both the Prisoner Management Console and the hand tracker thingamabob.
Also:
Added a line break on chemical implants on the prisoner management computer so the read out doesn't look like arse. (see here https://www.dropbox.com/s/nawkd06ztqkmkqe/Screenshot%202015-03-28%2015.16.06.png?dl=0 )
Fixed the wrong path for weapons auth implants' descriptions
2016-02-11 23:20:46 +00:00
35ab127543
Merge pull request #15389 from KorPhaeron/babydontfearthereaper
...
Fixes reaper scythe item_state
2016-02-11 12:30:01 -05:00
c04acddef9
Merge pull request #15381 from neersighted/runtime_meet_proc
...
Fix a number of runtimes
2016-02-10 23:50:38 -06:00
50aa10403a
removes useless returns
...
Made on my phone so it might fuck something up, hopefully not
2016-02-10 19:42:18 -08:00
ca8e3c6a0a
Merge pull request #15157 from LanCartwright/nomorehardsuit
...
Removes hardsuit from bulldog bundle
2016-02-10 21:21:42 -06:00
eeb96cb7a5
Merge pull request #15360 from neersighted/ionsomething
...
Remove borg jetpack, give them ion thrusters instead
2016-02-10 18:19:13 -06:00
0291f450d2
Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdatesChanges
...
Conflicts:
code/modules/mob/living/carbon/life.dm
code/modules/mob/living/death.dm
code/modules/mob/living/login.dm
code/modules/mob/mob.dm
2016-02-10 22:35:19 +01:00
61796470b8
Fix suicide_act message text
2016-02-10 15:22:09 -06:00
ae21d76bf8
Refactor suicide
...
Buff the SORD: you can now do 200 damage. Of stamina damage. To yourself. By attempting suicide.
2016-02-10 15:01:08 -06:00
bbd20807b7
Indents with tabs instead of spaces
2016-02-10 10:38:51 -06:00
85e80780ce
Fix storage runtime
...
Mobs without clients can't see into storage! They have no screen!
The following runtime has occured 92 time(s).
runtime error: Cannot read null.screen
proc name: show to (/obj/item/weapon/storage/proc/show_to)
source file: storage.dm,104
usr: Leo Pfeifer (/mob/living/carbon/human)
src: the backpack (/obj/item/weapon/storage/backpack)
2016-02-10 07:20:25 -06:00
3c2c923b22
Fixes scythe item_state
2016-02-10 05:06:18 -06:00
9a6300e2a2
Merge pull request #15173 from KorPhaeron/holy
...
Allows the chaplain to choose his holy weapon theme
2016-02-09 23:42:56 -06:00
91ecb5a603
Fix for the fix
2016-02-09 23:31:34 -06:00
2566e424b3
Fixes, special effects for whip and carp
2016-02-09 23:14:50 -06:00
49066cdc72
removes EMPlight from EMP kit
...
separate commit because inbuilt editor cannot into editing two files in one PR
2016-02-09 16:50:17 -08:00
173387eefc
Remove borg jetpack, give them ion thrusters instead
...
Also clean up jetpack human movement because wow that code was messy
Its still bad but its better (tm)
2016-02-09 14:53:37 -06:00
ba2e629525
Merge pull request #15286 from AnturK/bagofboom
...
Adds C4 bag to uplink
2016-02-08 21:39:31 -03:00
f97c8a00f2
Internals action button
2016-02-08 17:10:04 -06:00
eaa6bc7b18
Implement better jetpack action button
2016-02-08 17:09:12 -06:00
phil235
KorPhaeron
KorPhaeron
AnturK
Cheridan
Lo6a4evskiy
xxalpha
Remie Richards
Nerd Lord
tkdrg
AnturK
Malkevin
duncathan salt
PKPenguin321
octareenroon91
Bjorn Neergaard
