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
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
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
5a26db0285
Merge pull request #6401 from Menshin/solars_runtime_fix
...
Fixes controless solar tracker runtime
2014-12-17 11:04:29 -08:00
7ea29f961e
Merge pull request #6404 from tkdrg/moarfuntiems
...
Fixes 2 runtimes
2014-12-17 11:03:41 -08:00
82654b579a
Merge pull request #6395 from Steelpoint/master
...
Security Beret + Jumpsuit Sprites
2014-12-17 13:53:45 +03:00
8d649f60d7
Merge pull request #6365 from phil235/StraightJacketRemovalFix
...
Fixes being able to remove clothing while straightjacketed or handcuffed
2014-12-16 11:02:43 -08: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
c021bda843
Merge pull request #6250 from tkdrg/CRYSTAL-DELAMINATION-IMMINENT
...
Ports the supermatter engine from /vg/
2014-12-16 15:26:36 +00:00
2cbcda1a5f
Merge pull request #5702 from Donkie/traylayer
...
Morgue/Crematorium update
2014-12-16 14:27:49 +01:00
672b476f23
Tidying a little
2014-12-16 13:16:19 +01:00
fb5eeb4265
HoP/BartenderArmor
2014-12-16 15:35:49 +08:00
d4c2cc3b64
MapChanges/ArmourSpriteChanges
2014-12-16 11:48:06 +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
3e90c2863e
Fixes 2 runtimes
...
Fixes antag hud runtime due to checking the mind before transferring it.
Fixes floorbot runtime due to typecasting with no sanity checks.
2014-12-15 22:30:23 -03:00
4ceaa597ab
Merge pull request #6385 from phil235/UsedSlimecoreFridgeFix
...
Fixes not being able to remove used slime extract from smartfridge
2014-12-15 16:28:39 -08:00
5dd86ab53d
Merge pull request #6370 from Xhuis/monkeying_around
...
Fixes monkeys being able to read books
2014-12-15 16:27:51 -08:00
c5ba564993
Merge pull request #6374 from phil235/SneezingSpreadFix
...
Fixing sneezing symptom not spreading its virus airborne.
2014-12-15 16:27:27 -08:00
4ef5afbc67
Merge pull request #6371 from phil235/VentcrawlStunFix
...
Fixes monkey being able to ventcrawl if stunned after initial altclick
2014-12-15 16:27:11 -08:00
a9e3edbffe
Merge pull request #6359 from phil235/SlimeAttackSlimePeopleFIx
...
Fixes Slimes attacking slime people.
2014-12-15 16:26:26 -08:00
f96f222c18
Merge pull request #6358 from tkdrg/demplatings
...
Fixes being able to turn asteroid into normal turf
2014-12-15 16:25:45 -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
51e10e6a19
Fixes controless tracker runtime
2014-12-16 01:23:29 +01:00
6644f5dccd
Merge pull request #6363 from phil235/HeadCoverBitflagFix
...
Fixes helmet flags being broken
2014-12-15 16:23:29 -08:00
a1f263ec67
Merge pull request #6364 from phil235/DefibMessageColorFix
...
Changes defibrillator success/failure messages color
2014-12-15 16:18:42 -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
1519e320ee
Merge pull request #6357 from tkdrg/funtimes
...
Fixes two runtimes
2014-12-15 10:05:38 -08: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
0864822177
Part1TestingTheWaters
2014-12-15 18:41:33 +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
753202d008
Merge pull request #6341 from paprka/gunspritefix
...
Fixes a few bugs with gun and ammo icons
2014-12-14 23:26:36 -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
ecba7e1283
Merge pull request #6300 from Thunder12345/grenade_slugs
...
Adds a new FRAG-12 explosive shotgun shell
2014-12-14 21:07:44 -06:00
ff36952344
Fixes not being able to remove used slime extract from the slime extract smartfridge in xenobio.
2014-12-15 01:30:18 +01: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
ba452b9f2b
Removing the hardcoded spread_range value when there's a force_spread.
2014-12-14 23:14:26 +01:00
c2ddfc0155
Fixing sneezing symptom not spreading its virus airborne.
2014-12-14 22:24:10 +01:00
b67043f267
Merge pull request #6329 from phil235/HungerChange
...
Hunger change
2014-12-14 12:55:21 -06:00
dc654e74db
Removes white ian undershirt
...
As requested by the head coders. Too many ian shirts.
2014-12-14 15:21:28 -03:00
f3df4e67bd
Fixes monkey being able to ventcrawl if stunned after the ventcrawl action is initiated. Also changes ventcrawl messages to use visible_message() and audible_message().
2014-12-14 19:18:13 +01:00
tkdrg
hornygranny
Razharas
Cheridan
Remie Richards
Swag McYolosteinen
Menshin
Steelpoint
Cuboos
Menshin
Razharas
phil235
KyrahAbattoir