Razharas
f0c8f2eeac
Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
...
Conflicts:
code/modules/reagents/Chemistry-Reagents.dm
conflicts resolution
2014-12-16 02:52:08 +03:00
Cheridan
024817b0b2
Merge pull request #6154 from phil235/ClosetResistFix
...
Fixes not being able to get out of a wrapped closet by resisting
2014-12-15 02:53:33 -06:00
Cheridan
7491cc38f7
Merge pull request #6346 from TZK13/Chemical-Closet-Sprites
...
Adds distinct sprites for the chemical closet
2014-12-14 23:21:04 -06:00
Razharas
bafef911d4
Merge pull request #6317 from paprka/saltyfuckingcuntm8
...
Security aesthetic overhaul
2014-12-14 07:57:33 +03:00
TZK13
0df50e5c6e
Adds distinct sprites for the chemical closet.
2014-12-13 22:04:43 -06:00
Razharas
44cc6c6d97
Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
2014-12-14 03:07:13 +03:00
paprka
40943d5684
reverts some sechailer and other feature things
2014-12-13 00:09:58 -08:00
paprka
868f29ada7
reverts armband change
2014-12-12 10:53:35 -08:00
Razharas
0921aa201f
Added datum mutations
...
Also removed some mob vars like sdisabilities and merged the usability
with disabilities
Removed need for mutations var, they are not handled in dna
Removed blinded var, now its handled by eye_blind being bigger than zero
Ands lots, lots of other shit in files that used mutations
2014-12-12 04:48:11 +03:00
paprka
76f7765c7b
lockers for boxes
2014-12-11 12:13:13 -08:00
paprka
e9477cfe9d
initial commit for better security clothing
2014-12-11 11:50:52 -08:00
Hornygranny
72132b1bf1
fixes whitespace
2014-12-09 16:32:16 -08:00
Hornygranny
af3f1aa4d8
Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor
...
Conflicts:
code/game/machinery/deployable.dm
code/game/objects/items/weapons/storage/lockbox.dm
code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
code/modules/clothing/glasses/hud.dm
code/modules/mob/living/silicon/robot/robot.dm
2014-12-09 16:03:45 -08:00
Cheridan
d529235696
Merge pull request #6187 from phil235/GrilleWindowFix
...
Fixes being able to place multiple fulltile window on a grille.
2014-12-09 12:51:05 -06:00
Razharas
0b32dc97a7
Merge pull request #6136 from optimumtact/patch-3
...
Grille throwforce is now halved against grilles, instead of -5
2014-12-09 05:31:32 +03:00
Swag McYolosteinen
b828448645
Merge pull request #6228 from paprka/coatscoats
...
Adds winter coats and changes labcoat toggling
2014-12-08 11:35:56 +01:00
Swag McYolosteinen
bff2e62a0f
Merge pull request #6175 from Razharas/ExActFix
...
Fixes ex_act() destroying too much shit
2014-12-08 08:03:35 +01:00
paprka
bf207efa9a
santa hats for sec and sprite tweak
2014-12-07 20:22:54 -08:00
paprka
c158599253
Christmas santa hats!
2014-12-07 20:02:03 -08:00
paprka
89c1469b06
updates metastation for winter coats, tweaks spawning, tweaks santa hat
2014-12-06 23:00:34 -08:00
Remie Richards
9368500614
Merge pull request #6208 from tkdrg/wooh
...
Fixes ausbushes icon_state for the subclasses
2014-12-06 23:56:51 +00:00
Razharas
cd218a7ba3
Proper handling of computers and tables by c4
...
Proper handling of computers and tables by c4
2014-12-06 21:44:52 +03:00
paprka
0f3f0659d1
coats to lockers, winter boots
2014-12-05 21:14:49 -08:00
Razharas
7758a0afed
Ok now explosions shall work properly
...
Changed severity to target, make items not destroy themselves on
severity lower than 1, all that stuff
2014-12-05 23:21:48 +03:00
Cheridan
7a13804890
Merge pull request #6191 from phil235/RestrainedTableClimbingFix
...
Makes table climbing while restrained take twice as long.
2014-12-05 10:35:32 -06:00
paprka
9e9b8b440d
adds winter coats and changes labcoat toggling
2014-12-04 21:29:21 -08:00
Cheridan
f909d59d1a
Merge pull request #6130 from phil235/AttackMsgStandardizedFormat
...
Standardizing attack messages to always show the attacker first
2014-12-04 12:45:31 -06:00
tkdrg
94520e04e0
Fixes ausbushes icon_state for the subclasses
2014-12-03 21:34:02 -03:00
phil235
d840fa74ac
Makes table climbing while restrained take twice as long.
...
Making tablepush and climb_table procs a bit more oop.
Fixes typo in glass table climbing message.
Table-pushing someone is now logged.
Adding a check to table climbing to return if table is destroyed mid-climb
2014-12-02 23:25:36 +01:00
phil235
3160ac56b1
Fixes being able to place multiple fulltile window on a grille.
...
Fixes being able to place a fulltile window on a grille with single dir windows.
Fixes a typo in grille message.
Grille now needs to be anchored to place a window on it.
2014-12-02 22:00:25 +01:00
phil235
f19c4c455d
Fixes not being able to resist out of a /structure/closet that is loaded inside a mech.
2014-12-01 00:00:25 +01:00
Orange Borg
97f10f6812
Add feedback to window construction/deconstruction
...
Users didn't get any feedback when the process started
2014-12-01 10:36:26 +13:00
Orange Borg
7015cb3f8d
Remove the -5 throwforce against grilles, replaces with * 0.5
...
As per dicusssion on #6092 which Raz merged before I could add the change.
Max left in as a guard against -forces magically healing the grille.
2014-12-01 10:00:55 +13:00
phil235
00ab7e09b8
Fixes not being able to get out of a wrapped closet by resisting as a monkey, borg, slime.
2014-11-30 20:41:42 +01:00
hornygranny
e7d862b248
Merge pull request #6119 from Intigracy/recursivebyebye
...
Removes recursive explosions
2014-11-28 16:33:30 -08:00
Razharas
b3f79777c9
Merge pull request #6092 from optimumtact/patch-1
...
Stop items having a negative throw force against grilles
2014-11-28 15:16:59 +03:00
Intigracy
8a1baad03b
forgot the var / proc
2014-11-27 14:50:21 -08:00
Razharas
d2848e5f95
Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour
2014-11-28 00:32:30 +03:00
Razharas
275d7fdd77
Merge pull request #6038 from paprka/hatfix
...
fixes head of security and warden hat flashbang confusion
2014-11-27 17:14:51 +03:00
Razharas
c5209f2399
Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour
2014-11-27 15:30:37 +03:00
Orange Borg
c9665d4b2f
Stop items having a negative throw force against grilles
...
This prevents the grille from gaining health if you hit it with something less than 5 tforce
2014-11-27 12:07:55 +13:00
hornygranny
3ad160f98e
Merge pull request #6027 from fleure/airlockfix
...
Fixes multiple airlocks on same tile
2014-11-26 10:57:54 -08:00
hornygranny
fb3c9d7d11
Merge pull request #6062 from TZK13/yeloww
...
Fixes yellow wardrobes being invisible when you closed them
2014-11-26 10:57:30 -08:00
paprka
483166e5ae
detective bowman
2014-11-24 21:57:44 -08:00
paprka
882e868e7b
Fixed runtime and added syndie headset protection
2014-11-24 21:54:09 -08:00
TZK13
93370c7d93
Fixes yellow wardrobes being invisible when you closed them.
2014-11-24 21:41:33 -06:00
paprka
6d86949742
removes flashbang protection from hats, gives it to bowman headsets
2014-11-24 05:55:13 -08:00
phil235
1f4a071940
Fixing a similar bug with door assembly.
2014-11-24 13:21:25 +01:00
phil235
b725206f3a
Fix windoor construction exploit.
2014-11-24 13:12:00 +01:00
phil235
86405fa8c0
Standardizes attack messages to always show the attacker first (when there is an attacker).
...
Replacing some fo mob in viewers() show_message() with visible message().
Simplifying some message code in a couple places, fixing typos and span classes.
2014-11-24 01:49:34 +01:00
