3fb065cd29
improves telebaton and police baton
2014-12-16 22:33:09 -08:00
ef189dc9d4
adds dirt overlays for walking on turfs
2014-12-16 22:12:14 -08:00
d5a7d82959
Fixes a lot of "the the" in messages.
2014-12-16 22:59:55 +01:00
fd7d6f733f
Merge pull request #6053 from phil235/LightMatchFix
...
Fixing not being able to light a cigarette in someone's mouth with a lit match
2014-12-16 12:40:49 -06:00
9b050ff010
removes meta protection from binary translator key
2014-12-16 00:37:54 -08:00
bb273c5034
path fixes
2014-12-15 18:40:50 -08:00
e91796d59c
proper sound changes
2014-12-15 18:36:19 -08:00
7288f865fe
undoes tortoisegit merge fuckery
2014-12-15 18:23:50 -08:00
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
881fd8eaee
Merge pull request #6223 from Ergovisavi/back_slot_toggle_items_fixes
...
Fixing issues and updating equip method for Watertank Backpack / Defib
2014-12-15 16:24:58 -08:00
a1f263ec67
Merge pull request #6364 from phil235/DefibMessageColorFix
...
Changes defibrillator success/failure messages color
2014-12-15 16:18:42 -08:00
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
feeb650701
Removes useless standard encryption keys from headsets
2014-12-15 14:59:19 -08:00
d5d7b7f4d7
Fix of c4 not deleting on signaler explosions
...
Fixes #6393
2014-12-16 00:47:09 +03:00
4f026fc324
Fixes the welder's onmob sprite not updating when turning off due to lack of fuel. Fixing experimental weldingtool having an invisible sprite.
2014-12-15 16:45:10 +01:00
b143e41b88
Merge pull request #6265 from Miauw62/HOHOHO
...
SANTA IS COMING TO STATION
2014-12-14 23:58:28 -06:00
f9eacb4498
Merge pull request #5854 from A4Brogan/Ghetto_Banana_Lamp
...
Ghetto Banana Lamp
2014-12-14 23:51:18 -06:00
fd550c82ff
Prevent using the hand teleporter from inside closets and when under the influence of a chameleon projector.
2014-12-15 00:08:03 +01:00
027ce2a1df
Changes defibrillator success/failure messages from using boldnotice span class to using notice span class for success and warning span class for failure.
2014-12-14 17:32:03 +01:00
b983176937
Merge remote-tracking branch 'upstream/master' into fashionandfashionaccesories
...
Conflicts:
icons/mob/uniform.dmi
icons/obj/clothing/uniforms.dmi
2014-12-14 11:59:45 -03:00
a1f3a51dab
Adds Librarian PDA cartridge
2014-12-14 13:59:35 +01:00
0b26a71a71
Merge pull request #6333 from tkdrg/singulobj
...
The singularity/narsie are no longer machines
2014-12-14 10:02:39 +03:00
21a2c2d21e
Made clumsiness into disability
...
I really dont want to make clumsy_act()
2014-12-14 08:04:48 +03:00
bafef911d4
Merge pull request #6317 from paprka/saltyfuckingcuntm8
...
Security aesthetic overhaul
2014-12-14 07:57:33 +03:00
44cc6c6d97
Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
2014-12-14 03:07:13 +03:00
3bd3175a18
Removed unused armbands
2014-12-13 00:14:03 -08:00
c104ad6cd4
Merge pull request #6323 from AndroidSFV/fix6313
...
Fixes 6313
2014-12-12 23:01:43 -06:00
79e8ad4142
The singularity/narsie are no longer machines
2014-12-12 19:42:37 -03:00
8d110ee496
Tiny clean up, still lots of work to do
...
Only compiletested, these changes were never tested in the game yet
2014-12-12 23:57:11 +03:00
3a0927febd
Fixes 6313
2014-12-12 11:16:54 -06:00
11f6c7c401
Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
2014-12-12 04:51:16 +03:00
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
98a865298a
Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor
...
Conflicts:
code/game/mecha/mech_fabricator.dm
2014-12-11 13:53:37 -08:00
e9477cfe9d
initial commit for better security clothing
2014-12-11 11:50:52 -08:00
27793609d8
Merge pull request #6201 from fleure/togglefix
...
Fixes toggling watertank nozzle in hands with verb
2014-12-11 12:21:32 -06:00
3ede77face
Merge pull request #6189 from Menshin/exofab_revamp_end+fixes
...
Exofab revamp finishing and fixes
2014-12-11 11:52:16 -06:00
2619beccdf
Merge pull request #6270 from optimumtact/iflashedu
...
Fix flash messages when failing to flash
2014-12-11 06:35:29 -06:00
ece2bb00c3
Merge pull request #6242 from Dorsisdwarf/RCDbuff
...
Buffs the RCD
2014-12-10 06:23:28 -06:00
99f364f480
makes APC call parent
2014-12-09 18:53:29 -08:00
f34fcd6124
overrides attack
2014-12-09 18:10:17 -08:00
947074d085
Adds the handheld crew monitor.
2014-12-09 19:42:54 -05:00
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
41f0d0e04f
Fix flash messages when failing to flash
...
It would give the success message when flashing carbons even if the flash
had actually failed to work
2014-12-09 09:38:26 +13:00
4237c406e4
Merge branch 'master' of https://github.com/tgstation/-tg-station into fashionandfashionaccesories
...
Conflicts:
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
2014-12-08 13:53:31 -03:00
12279d9c8e
Adds a santa event where a dead player is spawned as Santa! HO HO HO!
...
Also adds a few more things to the random gifts.
2014-12-08 17:03:52 +01:00
b828448645
Merge pull request #6228 from paprka/coatscoats
...
Adds winter coats and changes labcoat toggling
2014-12-08 11:35:56 +01:00
bff2e62a0f
Merge pull request #6175 from Razharas/ExActFix
...
Fixes ex_act() destroying too much shit
2014-12-08 08:03:35 +01:00
65bdf75fc0
Adds changelog and nerfs door deconstruction.
2014-12-07 11:46:59 +00:00
eeea775d67
Merge pull request #6188 from tkdrg/miauwpls
...
Fixes the new AI lawcap config option
2014-12-06 23:55:15 +00:00
931bddc657
actually fixes the description
2014-12-06 11:41:35 +00:00
paprka
phil235
Cheridan
Hornygranny
Cuboos
Razharas
KyrahAbattoir
tkdrg
AnturK
Razharas
AndroidSFV
Xhuis
oranges
Miauw
Dorsisdwarf
Remie Richards