Commit Graph

13853 Commits

Author SHA1 Message Date
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
Nerd Lord 18bbc4758a Blob Sorium and Dark Matter properly reduce range based on bio protection.
Updates blob tips.
Blobs now consume walls that are on their tile.
Added a space between blob follow link and message.
2016-02-12 20:07:44 -05:00
tkdrg fa287ee090 Merge pull request #15146 from Buggy123/patch-13
Adds cable coils to autolathe
2016-02-12 21:39:40 -03:00
phil235 02d5d24daa Fixes Malfpowwer upgrade camera net not giving the AI nightvision
Fixes client eye not being update when using shadow walk or ethereal_jaunt inside a container.
Fixes thrall vision spell not udating your vision.
Fixes Shift Nerves shadowling ability not adjusting your night vision range correctly.
Using shadow walk now extinguishes the shadowling.
2016-02-13 01:17:21 +01:00
AnturK 7f8dc6710f Fixes autolathe search 2016-02-13 00:55:58 +01:00
Buggy123 5788e89ffa Added cable coils to the autolathe
Cable coils will only be built in stacks of 30, at maximum.

Reduced cable coil cost to 1/4 to be more in line with other tool costs.

Reduced cable coil cost to 1/4 to be more in line with other tool costs.

Fixed it not compiling?

Finally got it to compile

Fixes bad code

removed unnecessary /var

Added maxstack var to define custom stack sizes for things

Allowed the autolathe to use custom stack sizes.

Adds correct maxstack values to various stackable objects
2016-02-12 18:17:34 -05:00
tkdrg bc073db38f Merge pull request #15477 from Fox-McCloud/declaring-war
[s]Fixes Nuke Ops Exploit
2016-02-12 19:49:08 -03:00
Fox-McCloud 8bb4b8c494 [s]Fixes Nuke Ops Exploit 2016-02-12 17:40:06 -05:00
phil235 dab224ef2c Fixes clonee in crit not falling down when ejected from the cloning pod. 2016-02-12 22:31:07 +01: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
tkdrg e0979bd010 Merge pull request #15394 from AnturK/rnd_opt
RnD Optimization
2016-02-12 14:33:09 -03: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
Shadowlight213 2db18233d4 Makes shade poll respect prefs and cultist bans 2016-02-11 19:41:06 -08: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
AnturK d47b43107d Merge pull request #15405 from phil235/VisionDisposalFix
Fixes vision bug with disposal.
2016-02-11 23:25:44 +01:00
AnturK b62988b284 Switches known_designs/tech to associative list. 2016-02-11 20:25:23 +01:00
octareenroon91 f1c225c59f Update suicide.dm
Remove unneeded updatehealth() calls
Cleanup logic in an if statement
2016-02-11 12:47:08 -06: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
Bjorn Neergaard 4089d850cc Address feedback
Canisters mixtures can no longer be null thanks to accepting
one in New()

Just forget assert_gas in objectives
2016-02-10 23:42:15 -06:00
duncathan salt aa87e1438e Merge pull request #15116 from KorPhaeron/new_objectives
Three new malf objectives
2016-02-10 23:11:54 -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 a27a0a1e33 Merge pull request #15303 from KorPhaeron/Lesser
Nerfs lesser summon guns
2016-02-10 21:36:30 -06: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
phil235 6352f01bd9 derp 2016-02-10 23:22:09 +01: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 34214d321a Fixes revenant not seeing itself and not having his action buttons.
Fixes many mobs having a null hud_used.
Fixes fullscreen overlay disappearing when toggling the hud.
Fixes our vision when being ejected by a delivery chute and when inside a disposal unit that is being destroyed.
2016-02-10 23:17:44 +01: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
tkdrg 38a4ca4168 Merge pull request #15349 from octareenroon91/autolathe-buff
Enables design transfer to autolathe by disk.
2016-02-10 16:39:31 -03:00