Razharas
9a27fe7c8d
Conflict fix
...
Yeah makes it all work
2014-12-21 06:12:33 +03:00
paprka
f1963ce537
Merge branch 'master' of https://github.com/tgstation/-tg-station into parahats
...
Conflicts:
code/modules/clothing/head/soft_caps.dm
icons/mob/head.dmi
icons/obj/clothing/hats.dmi
2014-12-19 10:41:27 -08:00
Cheridan
566066a73a
Merge pull request #6441 from paprka/corpsecthecorpening
...
Corporate Security aesthetic update
2014-12-18 02:14:33 -06:00
paprka
9d46ccceac
old warden jacket for the lockers
2014-12-17 23:01:10 -08:00
Cheridan
62252f0273
Merge pull request #6420 from phil235/TypoFix2
...
Fixes a lot of "the the" in messages.
2014-12-17 16:06:35 -06:00
paprka
4075e59e04
corporate security initial commit
2014-12-17 08:14:22 -08:00
Razharas
82654b579a
Merge pull request #6395 from Steelpoint/master
...
Security Beret + Jumpsuit Sprites
2014-12-17 13:53:45 +03:00
paprka
f0d80d487d
adds EMT caps
2014-12-16 21:04:27 -08:00
phil235
d5a7d82959
Fixes a lot of "the the" in messages.
2014-12-16 22:59:55 +01:00
Cheridan
79af296b6d
Merge pull request #6366 from phil235/ChairSpinningFix
...
Fixes not being able to rotate your chair while buckled to it.
2014-12-16 12:27:35 -06:00
Swag McYolosteinen
2cbcda1a5f
Merge pull request #5702 from Donkie/traylayer
...
Morgue/Crematorium update
2014-12-16 14:27:49 +01:00
Steelpoint
fb5eeb4265
HoP/BartenderArmor
2014-12-16 15:35:49 +08:00
Cuboos
0bb7d2a5a5
Merge remote-tracking branch 'remotes/upstream/master' into CuboosSoundS1E1
...
Conflicts:
code/game/objects/items/weapons/defib.dm
config/admins.txt
2014-12-15 18:12:14 -08:00
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
Steelpoint
4b9a87a808
MoveBeretsToSecureLocker
2014-12-15 19:46:32 +08: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
phil235
61c8d6ab33
Fixes not being able to rotate your chair while buckled to it.
2014-12-14 18:11:49 +01:00
Daniel Hultgren
5071d307b0
Can now click switch with any object
2014-12-14 12:22:15 +01: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
Daniel
536c0b55a5
Morgue update
2014-12-13 12:42:49 +01: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
Cuboos
8175bd91e0
Mining sound revamp, using realistic sounds now instead of reusing sound. Plus improved Taser sound.
2014-12-09 19:38:49 -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
