2f3bceb79c
Merge pull request #6445 from phil235/GiveLightCig
...
Refactoring cigarette lighting and esword activation a bit.
2014-12-21 05:27:30 -08:00
5a48f313cb
Merge pull request #6399 from paprka/radioshit
...
Removes useless standard encryption keys from headsets
2014-12-21 05:08:10 +00:00
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
f1101f77a9
Adds 3 more scarves
...
These striped scarves are made by MrSnapwalk. They are included in the
ClothesMate along with the other scarves (sprited by Nienhaus). These
have a striped texture.
2014-12-19 00:24:01 -03:00
d44fa004b0
Merge branch 'master' into scarfs
...
Conflicts:
icons/obj/clothing/ties.dmi
2014-12-18 23:35:15 -03:00
eaec9a6e1b
9 more scarves and small corgi cleanup
...
Adds 9 more scarves (light blue, dark blue, orange, yellow, purple,
white, black, zebra and christmas).
Cleaned up corgi code a little bit, specially the parts involving icon
updates. Fixes a bug where adding a hat to a dead corgi didn't make you
drop your hat and created duplicate items. Makes corgis only use one
head/back mob sprite and rotate it appropriately. Call
regenerate_icons() only when needed now, instead of doing so every tick
on Life().
2014-12-18 23:09:49 -03:00
ac5c322327
Merge pull request #6434 from paprka/singulobombing
...
Fixes singulo bombing
2014-12-18 10:39:57 -08:00
25188e441b
Little fix.
2014-12-18 18:00:17 +01:00
566066a73a
Merge pull request #6441 from paprka/corpsecthecorpening
...
Corporate Security aesthetic update
2014-12-18 02:14:33 -06:00
9d46ccceac
old warden jacket for the lockers
2014-12-17 23:01:10 -08:00
62b99c7007
Adds scarfs
...
These come in red and green, and can be equipped in the tie slot.
They are available from the ClothesMate vendomat. Sprites by Nienhaus.
2014-12-17 19:19:15 -03:00
62252f0273
Merge pull request #6420 from phil235/TypoFix2
...
Fixes a lot of "the the" in messages.
2014-12-17 16:06:35 -06:00
e132f206cf
derp.
2014-12-17 22:47:50 +01:00
bbb8eae106
Adding candle, flare and torch to is_hot() proc, fixing energy/blade returning false for it.
...
Refactoring cig lighting code a bit.
Refactoring the attack_self() procs of weapon/melee/energy and its children.
Fixed energy axe suicide code typo.
Energy axe now makes noise when toggle on/off, just like esword.
2014-12-17 22:32:40 +01:00
97794c4035
Merge pull request #6383 from kyrahabattoir/HandTeleExploit
...
Prevent using the hand teleporter from inside closets and when under the...
2014-12-17 11:06:21 -08:00
ceea358967
Merge pull request #6397 from Razharas/C4fix
...
Fix of c4 not deleting on signaler explosions
2014-12-17 11:05:42 -08:00
efc3570135
Merge pull request #6396 from phil235/WelderSpriteUpdateFix
...
Fixes the welder's onmob sprite not updating when turning off
2014-12-17 11:04:54 -08:00
4075e59e04
corporate security initial commit
2014-12-17 08:14:22 -08:00
82654b579a
Merge pull request #6395 from Steelpoint/master
...
Security Beret + Jumpsuit Sprites
2014-12-17 13:53:45 +03:00
93166940f7
fixes singulo bombing
2014-12-17 02:25:33 -08:00
f0d80d487d
adds EMT caps
2014-12-16 21:04:27 -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
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
2cbcda1a5f
Merge pull request #5702 from Donkie/traylayer
...
Morgue/Crematorium update
2014-12-16 14:27:49 +01:00
9b050ff010
removes meta protection from binary translator key
2014-12-16 00:37:54 -08:00
fb5eeb4265
HoP/BartenderArmor
2014-12-16 15:35:49 +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
feeb650701
Removes useless standard encryption keys from headsets
2014-12-15 14:59:19 -08:00
56ddfc1367
Merge pull request #6331 from tkdrg/weews
...
Fixes disappearing alien weeds overlays
2014-12-15 14:24:25 -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
4b9a87a808
MoveBeretsToSecureLocker
2014-12-15 19:46:32 +08:00
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
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
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
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
61c8d6ab33
Fixes not being able to rotate your chair while buckled to it.
2014-12-14 18:11:49 +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
5071d307b0
Can now click switch with any object
2014-12-14 12:22:15 +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
bafef911d4
Merge pull request #6317 from paprka/saltyfuckingcuntm8
...
Security aesthetic overhaul
2014-12-14 07:57:33 +03:00
0df50e5c6e
Adds distinct sprites for the chemical closet.
2014-12-13 22:04:43 -06:00
MrPerson
Remie Richards
paprka
tkdrg
hornygranny
phil235
Cheridan
Razharas
Swag McYolosteinen
Steelpoint
Cuboos
Razharas
KyrahAbattoir
Daniel Hultgren
TZK13