32fb136bf0
Merge pull request #3589 from Citadel-Station-13/upstream-merge-31855
...
[MIRROR] Dullahans
2017-10-30 23:54:25 -04:00
8c1dcd9429
Merge pull request #3692 from Citadel-Station-13/upstream-merge-31986
...
[MIRROR] You can now hide grenades in plushies
2017-10-30 23:33:16 -04:00
d37de6c297
Merge pull request #3693 from Citadel-Station-13/upstream-merge-32223
...
[MIRROR] Updated clownbox sprite to better match others.
2017-10-30 23:32:49 -04:00
09a198fb65
Merge pull request #3694 from Citadel-Station-13/upstream-merge-32225
...
[MIRROR] Deterministic output slots for smartfridges
2017-10-30 23:32:39 -04:00
53314289c8
Merge branch 'master' into upstream-merge-31855
2017-10-30 23:31:13 -04:00
f80bb03a23
Merge pull request #3684 from Citadel-Station-13/upstream-merge-32238
...
[MIRROR] welder refuelling hotfix
2017-10-30 23:30:22 -04:00
225603c600
thingy
2017-10-30 22:13:35 -05:00
1092b020f4
Merge pull request #3690 from Citadel-Station-13/upstream-merge-32214
...
[MIRROR] Fixes old simple animal humanoid issues
2017-10-30 22:14:32 -04:00
21d4ed4a5f
Merge pull request #3685 from Citadel-Station-13/upstream-merge-32200
...
[MIRROR] Adds force to items that lack force and shouldn't.
2017-10-30 22:14:15 -04:00
d3b5b64a51
Merge branch 'master' into upstream-merge-32238
2017-10-30 22:13:51 -04:00
4dbcce6885
Merge pull request #3683 from Citadel-Station-13/upstream-merge-32143
...
[MIRROR] Allows filling welders from open containers that have welding fuel in them
2017-10-30 22:12:04 -04:00
df6bd6fa4c
Merge pull request #3682 from Citadel-Station-13/upstream-merge-32140
...
[MIRROR] Fixes filling smoke machines with pills
2017-10-30 22:11:44 -04:00
6963ad2aac
Merge pull request #3680 from Citadel-Station-13/upstream-merge-32041
...
[MIRROR] Excludes clockwork wargolems from golem mutation toxin, nerfs normal clockwork golems
2017-10-30 22:11:33 -04:00
636e2a6d90
Update grenade.dm
2017-10-30 17:32:08 -05:00
48bdbd883b
Deterministic output slots for smartfridges
2017-10-30 14:35:26 -05:00
5bd7184d9c
Deterministic output slots for smartfridges ( #32225 )
...
* a spooky commit
* It is too late, the skeleton is already inside you
* mexican river dolphins for halloween 2018
* Compiler warnings for halloween 2018
2017-10-30 14:35:26 -05:00
177319f8bc
Updated clownbox sprite to better match others.
2017-10-30 14:35:17 -05:00
d615ecb340
Merge pull request #32223 from Mercenaryblue/Clown_Box_Sprite
...
Updated clownbox sprite to better match others.
2017-10-30 14:35:17 -05:00
0c4c4dc1f2
You can now hide grenades in plushies
2017-10-30 14:34:01 -05:00
21e934153f
Fixes old simple animal humanoid issues
2017-10-30 06:50:04 -05:00
f8bd9ecf9c
Fixes old simple animal humanoid issues ( #32214 )
...
* fixes issue
* ignore that
* Spacebattle doesn't even open in DM
* Conflicts fixed for real
* Fixes pathing weirdness
* wonderful
2017-10-30 06:50:04 -05:00
241d2d88e6
Merge pull request #3688 from Citadel-Station-13/upstream-merge-32156
...
[MIRROR] Fixes TakeComponent
2017-10-30 07:11:14 -04:00
b6a04b6649
Merge pull request #3689 from Citadel-Station-13/CharacterCreation
...
Fixes character issues on creation
2017-10-30 07:02:15 -04:00
ed2208a7ea
Merge pull request #3687 from Michiyamenotehifunana/CRITICAL-SPRITER-CRAP-NERFS
...
CRITICAL BALANCE FIXES TO CITADEL'S GUNS
2017-10-30 06:33:15 -04:00
e0cbc7b9a2
Fixes character issues on creation
2017-10-30 05:32:06 -05:00
9ea376dc81
fixes soporifics having the old two shot value
...
SSSSSH JUST PRETEND IT WAS A MISTAKE
2017-10-30 17:33:01 +08:00
c7bfa28dce
Fixes TakeComponent
2017-10-30 03:53:00 -05:00
47f88be07f
Fixes TakeComponent ( #32156 )
...
* Fixes TakeComponent
* Add the note about OnTransfer and COMPONENT_INCOMPATIBLE
* Fix behaviour
* Missed datum.dm
2017-10-30 03:53:00 -05:00
d0a28fcd62
NERF EVERYTHING
...
EVERYTHING OP NERF NOW also what the fuck how does a whole playerbase ignore balance issues for a whole fucking month only for a vilified member of the community to be so fucking helpful
2017-10-30 15:01:37 +08:00
969f92fb58
Delete nudge.py
2017-10-30 01:48:48 -05:00
fba46cd0e5
Delete server_tools.dm
2017-10-30 01:48:42 -05:00
f1002a7109
Merge pull request #3672 from Citadel-Station-13/upstream-merge-32206
...
[MIRROR] Fixes map_config validation
2017-10-30 00:00:31 -04:00
1fe4eb7d88
Merge pull request #3508 from Michiyamenotehifunana/recolorable-guns
...
Recolorable Guns and more ballistics for Security
2017-10-29 23:43:20 -04:00
0256d9af4a
Update tools.dm
2017-10-29 22:41:56 -05:00
48cc684de0
Update golems.dm
2017-10-29 22:41:23 -05:00
b0573cc67f
Merge pull request #3678 from Citadel-Station-13/upstream-merge-32144
...
[MIRROR] Adds new valentines; replaces outdated/shitty ones.
2017-10-29 23:38:55 -04:00
715a2fb918
Merge pull request #3677 from Citadel-Station-13/upstream-merge-32080
...
[MIRROR] Ice Spiders now use frost oil instead of toxin
2017-10-29 23:37:58 -04:00
3c08b5e4ca
Merge pull request #3676 from Citadel-Station-13/upstream-merge-32189
...
[MIRROR] Makes the atmos table accessible in MetaStation
2017-10-29 23:37:44 -04:00
4d3211f273
Merge pull request #3675 from Citadel-Station-13/upstream-merge-32185
...
[MIRROR] Fixes TP wizarding.
2017-10-29 23:37:30 -04:00
84272ea241
Merge branch 'master' into upstream-merge-32206
2017-10-29 23:36:39 -04:00
b6f0423840
Update map_config.dm
2017-10-29 22:23:17 -05:00
a7cada8691
Adds force to items that lack force and shouldn't.
2017-10-29 18:49:48 -05:00
119129a80c
Adds force to items that really should hurt when hit by ( #32200 )
2017-10-29 18:49:48 -05:00
36893d3188
welder refuelling hotfix
2017-10-29 17:23:15 -05:00
3ed1a681c7
Allows filling welders from open containers that have welding fuel in them
2017-10-29 16:55:38 -05:00
ebef4e6607
Allows filling welders from open containers that have welding fuel in them ( #32143 )
...
🆑
tweak: You can now use beakers/cups/etc that have welding fuel in them on welders to refuel them.
/🆑
Closes #31339
2017-10-29 16:55:38 -05:00
8f8bcd16cd
Fixes filling smoke machines with pills
2017-10-29 16:01:34 -05:00
e486038c2e
Fixes filling smoke machines with pills ( #32140 )
...
Fixes #32102
Checks for the OPENCONTAINER flag after seeing if the object being used to fill the smoke machine has reagents in it
2017-10-29 16:01:34 -05:00
2715fa9953
Merge pull request #3679 from Citadel-Station-13/upstream-merge-32174
...
[MIRROR] Halloween race fixes
2017-10-29 16:05:19 -04:00
a0590a0143
Merge pull request #3671 from Citadel-Station-13/upstream-merge-32217
...
[MIRROR] Corrects the assmos description in the changelog.
2017-10-29 15:52:34 -04:00
LetterJay