ad11039232
Merge pull request #15568 from PKPenguin321/patch-13
...
Pisses off the cleanbots
2016-02-18 18:00:21 -06:00
cc2ec12488
Merge pull request #15590 from KorPhaeron/icepacks
...
glorf jumpsuit
2016-02-18 20:37:20 -03:00
180bd6de79
Merge pull request #15588 from AnturK/isbuffingthisactuallygoodidea
...
Fixes tesla southern tendency.
2016-02-18 18:35:26 -03:00
00528835a5
Merge pull request #15561 from AnturK/tactical_chairs
...
Chairs/Beds Repathing/Refactor
2016-02-18 14:21:10 -03:00
11df2fa97a
Merge pull request #15544 from Shadowlight213/Jobbancacherebuilding
...
Fixes jobban cache not updating on jobbans and unbans
2016-02-18 14:03:58 -03: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
309bfa0e91
Merge pull request #15418 from MMMiracles/spaceman
...
Adds several templates for space ruins
2016-02-18 01:30:13 -06:00
cfcecba389
Merge pull request #15575 from phil235/ReviveFix1
...
Fixes mob revival
2016-02-17 20:42:10 -06:00
a2ef1ad26f
Merge pull request #15545 from Shadowlight213/defenderpref
...
Makes wizard academy defender respect prefs
2016-02-17 19:57:02 -06:00
6290022001
Merge pull request #15547 from KorPhaeron/seed_vault
...
Five lavaland ruins
2016-02-17 19:54:08 -06:00
2934e6c8b7
Merge pull request #15165 from xxalpha/urange
...
ultra range again
2016-02-17 21:32:38 -03:00
2b96cbbdce
Merge pull request #15574 from KazeEspada/Bagfixes
...
Bag tweaks.
2016-02-17 21:29:05 -03:00
fc9bf6479c
changes proc to acid_act(), adds more messages
...
cleanbots will rise
2016-02-17 15:50:13 -08:00
b8946d608e
Merge pull request #15480 from bgobandit/kitty
...
Cats now display a variety of catlike behaviors!
2016-02-17 17:07:05 -06:00
28b179908f
glorf
2016-02-17 16:59:56 -06:00
422b55d2f9
Fixes tesla southern tendency.
2016-02-17 22:52:10 +01:00
3c8652e346
Merge pull request #15504 from phil235/HatMaskFacialHairFixes
...
Fixes mask and head gear issues
2016-02-17 21:47:17 +01:00
54b87e0239
Fixes typo in suit.dmi
...
Removes action button from the paranormal response unit helmet
2016-02-17 21:32:46 +01:00
9c4d90c72c
Merge pull request #15564 from Incoming5643/ape_escape
...
Pun Pun has gained a few persistence save file features
2016-02-17 12:42:37 -06:00
7c0c66dba3
Merge remote-tracking branch 'upstream/master' into urange
2016-02-17 14:21:29 +00:00
f3fd49349c
Prisoner Transport
2016-02-17 06:32:32 -06:00
cebb046145
adds sfx, tweaks damage, changes proc to apply_damage()
...
known bugs: apply_damage isn't properly accounting for armor
2016-02-16 18:21:45 -08:00
2dd476f13e
Fixes shaking someone resting not making them stand up.
...
Fixes shaking someone not reducing the sleeping var if the mob asleep is buckled to stand up.
Fixes merge conflict issues.
Fixes my revive code leaving the revived AI blind.
2016-02-17 01:23:36 +01:00
5db3ab47c7
Merge branch 'master' of https://github.com/tgstation/-tg-station into ReviveFix1
...
Conflicts:
code/game/machinery/computer/aifixer.dm
code/modules/mob/living/carbon/carbon.dm
code/modules/mob/living/living.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/mob/living/silicon/robot/robot.dm
2016-02-17 00:33:26 +01: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
c1a1e90ca7
Merge pull request #15536 from optimumtact/spidersspiderseverywhere
...
Don't allow every single spider to be player controllable
2016-02-16 15:47:15 -06:00
5d8d5854f9
Bag tweaks.
...
Department Backpacks are now the default(instead of grey backpacks).
Fixed an error on humans where new humans would have an integer for their backpack.
This will not affect current preferences.
2016-02-16 14:03:35 -07:00
073817b0ba
Merge pull request #15538 from phil235/SpawnAtomFix
...
Fixes spawn_atom() runtime.
2016-02-16 03:51:12 -06:00
4a326e35a0
gives cleanbots a new emag function
...
they kill people now
2016-02-16 00:33:23 -08:00
f61707c6f9
Pun Pun has gained a few persistence save file features
...
Whatever Pun Pun is wearing on his/her head and face at round end will still be there at the start of the next round. Back and hands do not save for obvious balance reasons.
If Pun Pun dies but leaves an intact corpses his/her successor will be named Pun Pun II and inherit the items his corpse was wearing at the end of the round.
If Pun Pun gets gibbed the chain of monkeys is broken and the next round monkey will be a new progenitor with a potentially different name. Obviously their items won't be saved in this case.
2016-02-15 21:20:29 -05:00
7ede85391f
Merge pull request #15527 from phil235/ReviveFixes
...
Fixes blindness overlay after reviving.
2016-02-15 23:17:55 +01:00
b496ca6043
Don't allow every single spider to be player controllable
2016-02-16 10:00:23 +13:00
d14a7f2470
Another map
2016-02-15 13:45:16 -06:00
10abc21c2c
Merge pull request #15525 from AnturK/reliable_fix
...
Basic reliability fix
2016-02-15 16:44:58 -03:00
9cec5f51a2
Merge pull request #15546 from octareenroon91/patch-31
...
Correct generic chem patch icon
2016-02-15 05:23:46 -06:00
0e6a7b77c8
Seed Vault
2016-02-15 04:06:40 -06:00
e51d602ca6
Correct generic chem patch icon
...
Fixes #15540
2016-02-15 01:15:37 -06:00
b46b11d75d
Makes wizard academy defender respect prefs
2016-02-14 23:03:22 -08:00
11ea6993e9
Fixes jobban cache not updating on jobbans and unbans
2016-02-14 21:44:29 -08:00
a2d61685bb
Merge pull request #15508 from PKPenguin321/patch-13
...
Lowers cost of traitor surgery bag
2016-02-14 23:21:52 -03:00
57c9c08bef
Merge branch 'master' of https://github.com/tgstation/-tg-station into I_dont_know_why_Im_doing_this_but_its_not_your_job_to_stop_me
...
# Conflicts:
# code/modules/mob/living/simple_animal/parrot.dm
2016-02-14 17:57:03 -05:00
4aca9a1529
Fixes spawn_atom() runtime.
2016-02-14 23:49:25 +01:00
4d199e699d
adds speech_shuffle_rate as a var
...
speech_shuffle_rate will also raise when poly is fed a cracker to help cut down on line repetition
2016-02-14 17:46:15 -05:00
9e74538509
Merge pull request #15490 from octareenroon91/patch-37
...
Parrot-Cracker Balance
2016-02-14 19:41:31 -03:00
431421b2f2
Take cares of minor suggested code tweaks
2016-02-14 17:17:41 -05:00
610f2b47ba
Now requires 20 crackers to go from 1% to 100% speak_chance.
2016-02-14 15:34:07 -06:00
449c20ec74
Merge pull request #15497 from AnturK/scrub
...
Fixes scrubbers/vents showing pipes over flooring
2016-02-14 17:13:05 -03:00
c26de00dae
Merge pull request #15499 from neersighted/readmin
...
Fix and refactor deadmin/readmin
2016-02-14 17:08:13 -03:00
961331d00a
Fixes ethereal jaunt not updating your perspective at the end.
2016-02-14 19:29:34 +01:00
46597f41f6
Bit more flat
2016-02-14 17:39:44 +01:00
duncathan salt
tkdrg
AnturK
Cheridan
PKPenguin321
KorPhaeron
AnturK
phil235
xxalpha
KazeEspada
Incoming
oranges
KorPhaeron
octareenroon91
Shadowlight213
Incoming5643