Commit Graph

7022 Commits

Author SHA1 Message Date
tkdrg c52a3e88d4 Merge pull request #15447 from KorPhaeron/holy_weapons
Three more chaplain weapons
2016-02-13 17:29:47 -03:00
tkdrg e7af997785 Merge pull request #15441 from phil235/BrainChanges
Brain fixes and changes
2016-02-13 13:29:37 -03:00
duncathan salt c8d4d58124 Merge pull request #15424 from Firecage/humansuit
Makes the gibber give skins when gibbing humans. Also adds craftable human suits from human skin.
2016-02-13 10:22:34 -06:00
Jordie 12b804f3e7 Merge pull request #15455 from neersighted/derp
Prevent monkies/animals from picking up intercoms
2016-02-13 17:35:55 +11:00
Jordie 3746a65f2e Merge pull request #15454 from neersighted/whoops
Fix deconstructing crates/lockers/closets
2016-02-13 17:22:49 +11:00
tkdrg b230117223 Merge pull request #15439 from Malkevin/implants2
Tracking Implants
2016-02-13 00:17:09 -03:00
Joan Lung 24e2082086 Merge pull request #15437 from KazeEspada/backpackssatchelsdufflebagsohmy
Departmental Bags and Dufflebags.
2016-02-12 20:37:14 -05:00
Cheridan 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
phil235 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
Firecage 69569c4f81 merge conflict fix 2016-02-12 21:20:19 +02:00
AnturK dbeec9a194 Merge pull request #15402 from octareenroon91/FIX-SORD-FIX
Refactor suicide
2016-02-12 16:49:06 +01:00
Bjorn Neergaard 0f89670107 Prevent picking up anchored items 2016-02-12 01:00:55 -06:00
Bjorn Neergaard ad6f0cb157 Fix some poor intercom code 2016-02-12 00:11:50 -06:00
Bjorn Neergaard 8619725ab0 Prevent monkies/animals from picking up intercoms
WHY ARE THESE NOT ACTUAL MACHINES AAAAA
ANCHORED ITEMS?!

Fixes #15452
2016-02-12 00:05:18 -06:00
Bjorn Neergaard eb228fe342 Fix deconstructing crates/lockers/closets
Fixes #15449
2016-02-12 00:03:39 -06:00
KorPhaeron 80721379b4 Three more chaplain weapons 2016-02-11 21:45:19 -06:00
phil235 a0855f2693 Brains can no longer be blinded, even when inside a MMI.
Fixes borg made from staff of change not having a brain organ in their MMI.
Removes some duplicated procs in mob.dm (probably due to incorrectly fix merge conflicts)
You can now attack brains with a weapon even when not inside a MMI (previously only when in MMI).
Fixes brain vision not being given mech sight when put inside a mech.
Removing a brain from its MMI not place the brain in your hand instead of on the ground.
Fixes built cyborgs containing two mmis.
Damaged brain from attack can't be placed inside a cyborg.
Robotized humans (called Robotize()) , such as roundstart cyborgs, now have an MMI with the human's name (instead of having a brain with a borg name, which was inconsistent with built cyborgs).
Syndiborgs bought by nukeops now have a brain with the same last name as the ops team.
Fixes Borg created with staff of change not containing a brain organ.
Fixes brain being killable when inside cyborgs. Fixes borg dropping a dead mmi brain unable to talk. Brains are now immune to environment damage and radiation.
Fixes brain being able to suicide multiple times (if put in and out of an MMI)
2016-02-12 02:04:14 +01:00
Malkevin 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
Malkevin f234cdb919 Removed a redundant line in the tracking implant implant pad description. 2016-02-12 00:31:27 +00:00
Remie Richards 44b2344925 Merge branch 'backpackssatchelsdufflebagsohmy' of https://github.com/KazeEspada/-tg-station into fucking_kaze 2016-02-12 00:13:03 +00:00
KazeEspada 653902068e You can now select whether to start with a dufflebag. Also, you have the option to choose between generic or departmental bags.
And for all you baystation fans, I added leather satchels while I was at it.

Minor change: Atmos techs now start with engineering bags.
2016-02-11 16:48:08 -07:00
Malkevin 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
Malkevin 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
Joan Lung 35ab127543 Merge pull request #15389 from KorPhaeron/babydontfearthereaper
Fixes reaper scythe item_state
2016-02-11 12:30:01 -05:00
Firecage c4c37d6553 Makes the gibber give skins when gibbing humans. Also adds craftable human suits from human skin. 2016-02-11 09:59:23 +02:00
duncathan salt c04acddef9 Merge pull request #15381 from neersighted/runtime_meet_proc
Fix a number of runtimes
2016-02-10 23:50:38 -06:00
PKPenguin321 50aa10403a removes useless returns
Made on my phone so it might fuck something up, hopefully not
2016-02-10 19:42:18 -08:00
duncathan salt ca8e3c6a0a Merge pull request #15157 from LanCartwright/nomorehardsuit
Removes hardsuit from bulldog bundle
2016-02-10 21:21:42 -06:00
Cheridan eeb96cb7a5 Merge pull request #15360 from neersighted/ionsomething
Remove borg jetpack, give them ion thrusters instead
2016-02-10 18:19:13 -06:00
Bjorn Neergaard 27a838c17f Fix crate access; fix locker item-to-lock 2016-02-10 17:40:10 -06:00
AnturK 2c0dcb17de Merge pull request #15280 from phil235/VisionUpdatesChanges
Some adjustments to the new vision code
2016-02-10 23:20:20 +01:00
tkdrg 41901027db Merge pull request #15362 from lzimann/table
Some table fixing
2016-02-10 19:18:32 -03:00
phil235 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
octareenroon91 61796470b8 Fix suicide_act message text 2016-02-10 15:22:09 -06:00
octareenroon91 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
KorPhaeron bbd20807b7 Indents with tabs instead of spaces 2016-02-10 10:38:51 -06:00
AnturK 559ab8fa6f Merge pull request #15354 from neersighted/call_me_cratezy
Allow horizontal mobs to fit into crates
2016-02-10 16:17:19 +01:00
Bjorn Neergaard e4f3045487 Add spacecat
Fixes a revert in my last crate PR, spacecat added to asteroid
secret room (previously included a cat critter crate)
2016-02-10 09:15:03 -06:00
Bjorn Neergaard a16f554c35 Allow horizontal mobs to fit into crates
Also make stuffing into crates/lockers a mild stun akin to tabling
2016-02-10 09:14:58 -06:00
Bjorn Neergaard 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
KorPhaeron 3c2c923b22 Fixes scythe item_state 2016-02-10 05:06:18 -06:00
AnturK b2268b30ad Merge pull request #14851 from MrStonedOne/patch-130
[Ready]Tesla balance and code cleanup
2016-02-10 11:36:32 +01:00
duncathan salt 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
KorPhaeron 91ecb5a603 Fix for the fix 2016-02-09 23:31:34 -06:00
KorPhaeron 2566e424b3 Fixes, special effects for whip and carp 2016-02-09 23:14:50 -06:00
PKPenguin321 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
Leo 9ff6f0b0b2 Removes return 2016-02-09 19:54:46 -02:00
Lzimann 831d2e04cc Fix tabecrafting menu opening when you click the table
Also adds a cursor change when you drag the table to you. And fixes tablecrafting menu not opening if the table is empty.
2016-02-09 19:46:39 -02:00
Bjorn Neergaard 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
AnturK 03890d2ea4 Merge pull request #15250 from ChangelingRain/blobtooweak
Adds five new blob chemicals and some blob tweaks
2016-02-09 18:04:55 +01:00