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
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
f80bb03a23
Merge pull request #3684 from Citadel-Station-13/upstream-merge-32238
...
[MIRROR] welder refuelling hotfix
2017-10-30 23:30:22 -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
636e2a6d90
Update grenade.dm
2017-10-30 17:32:08 -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
0c4c4dc1f2
You can now hide grenades in plushies
2017-10-30 14:34:01 -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
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
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
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
5a92bafa75
Merge pull request #3670 from Citadel-Station-13/upstream-merge-31966
...
[MIRROR] Spooky Spectral Instruments
2017-10-29 15:51:17 -04:00
819244575d
Spooky Spectral Instruments ( #31966 )
...
* [dooting intensifies]
Spectral Instruments added
To be used with Spooky Skeletons.
* Spectral Re-balance
The spectral instruments no longer stun living creatures.
Text make you retain your loyalties now.
* Requested Changes
Added variable "too_spooky".
Defines if it will spawn a new instrument.
Re-balanced damage to 5 hits average per conversion.
Added admin notice to changelog.
* Loyalty text fix
* Spooky Trumpets
Removed comment.
Added missing spookiness.
* Spooky Dooting
Major Overhaul.
removed /brass/
Spooky Dooting is now a component.
Boneless humanoids no longer lose stamina.
* Spooky Dooting
mk2
2017-10-29 07:35:16 -05:00
d6d01ab630
Actually fixes meteors, again ( #32162 )
...
* Actually fixes meteors, again
* unrelated typo fix for an admin debug verb
2017-10-29 07:13:31 -05:00
fd2705b6e6
Merge pull request #3667 from Citadel-Station-13/upstream-merge-32141
...
[MIRROR] Allows RPD to place pipes on catwalks/girders
2017-10-29 04:23:46 -04:00
f900f2ea9a
Merge pull request #3660 from Citadel-Station-13/upstream-merge-31864
...
[MIRROR] Makes thermite a component
2017-10-29 04:23:16 -04:00
d182acae7f
Merge pull request #3659 from Citadel-Station-13/upstream-merge-31723
...
[MIRROR] Restricts some more areas from servant warp, and lets admins start the Ark on non-clockcult rounds
2017-10-29 04:22:03 -04:00
2503a90dc0
Merge pull request #3585 from Michiyamenotehifunana/CX-sword
...
Adds fancy Energy Swords (and a toy version)
2017-10-29 03:56:27 -04:00
1a292c8457
Merge pull request #3653 from Citadel-Station-13/upstream-merge-32119
...
[MIRROR] Fixes round conversion issues
2017-10-29 03:46:57 -04:00
d6c143c860
Merge pull request #3643 from Citadel-Station-13/upstream-merge-32121
...
[MIRROR] Fixes motion cameras runtiming when a target is deleted before they are detected to be leaving the range/dead.
2017-10-29 03:44:55 -04:00
c62f6ec353
Merge pull request #3632 from Citadel-Station-13/upstream-merge-32093
...
[MIRROR] Roundstart species pref fixes/removes redundant species config
2017-10-29 03:41:59 -04:00
74a33169cb
Merge pull request #3642 from Citadel-Station-13/upstream-merge-32051
...
[MIRROR] More radiation balance changes and fixes
2017-10-29 02:41:44 -04:00
bea9365ea9
Merge branch 'master' into upstream-merge-32093
2017-10-29 02:27:52 -04:00
e150fe28b6
Merge branch 'master' into upstream-merge-31877
2017-10-28 23:57:51 -04:00
d5856ad609
Allows RPD to place pipes on catwalks/girders ( #32141 )
...
* Allows RPD to place pipes on catwalks
* allows girders too
* fixes parenthesis
i sniff glue
2017-10-28 12:00:23 -05:00
4e4634649e
[MIRROR] [Review Again] Updates the cloning manual ( #3663 )
...
* [Review Again] Updates the cloning manual
* Update manuals.dm
2017-10-28 01:19:38 -07:00
0e553b26db
Merge branch 'master' into upstream-merge-31737
2017-10-28 02:20:25 -04:00
985fdcd22d
Update clown_items.dm
2017-10-27 23:56:37 -05:00
08153b0fbb
Update misc.dm
2017-10-27 23:56:13 -05:00
82c388b3e8
Makes thermite a component
2017-10-27 17:36:38 -05:00
37bb75a645
Restricts some more areas from servant warp, and lets admins start the Ark on non-clockcult rounds ( #31723 )
...
* Cleans up clockcult code a little
* Another thing with servants_active
* Now it compiles
2017-10-27 17:36:31 -05:00
ce4ccedd10
Merge pull request #32119 from AnturK/convertfix
...
Fixes round conversion issues
2017-10-27 17:32:30 -05:00
1110cca542
Fixes motion runtimes from deleted targets ( #32121 )
2017-10-27 04:47:45 -05:00
ea36d5944e
More radiation balance changes and fixes ( #32051 )
...
* more balance changes and fixes
* cleanup
2017-10-27 03:08:03 -05:00
af96c29a0c
Merge pull request #3635 from ktccd/Undo_Borer_HUDS
...
Undoes Borer HUDs
2017-10-27 02:49:03 -04:00
141de52658
Merge pull request #3641 from Citadel-Station-13/upstream-merge-30791
...
[MIRROR] Assmos part 1, #2
2017-10-27 02:47:56 -04:00
31ee6947ee
Merge pull request #3624 from Citadel-Station-13/upstream-merge-32039
...
[MIRROR] Rebalances clockwork marauders
2017-10-27 02:44:17 -04:00
3ad1ac335f
Merge pull request #3623 from Citadel-Station-13/upstream-merge-31991
...
[MIRROR] fixes reflectors dropping extra mats
2017-10-27 02:43:35 -04:00
f268112af1
Merge pull request #3617 from Citadel-Station-13/upstream-merge-32019
...
[MIRROR] Fixes defib ghost prompt
2017-10-27 02:18:14 -04:00
3b82c26cb5
Merge pull request #3612 from Citadel-Station-13/upstream-merge-32083
...
[MIRROR] Prevents inappropriate slapping
2017-10-27 02:16:34 -04:00
49fa09d1bd
Merge pull request #3578 from Citadel-Station-13/upstream-merge-31944
...
[MIRROR] Atmos construction rework again
2017-10-27 02:00:11 -04:00
eb4f6326d7
Assmos part 1, #2
2017-10-26 23:12:27 -05:00
4cc0cf3ee7
Merge pull request #3606 from Citadel-Station-13/upstream-merge-31972
...
[MIRROR] Greyscale cables
2017-10-26 16:53:08 -04:00
47b5fe53ab
Merge pull request #3605 from Citadel-Station-13/upstream-merge-32065
...
[MIRROR] Fixes excessive overlay churn
2017-10-26 16:52:19 -04:00
98ac9f27c8
Merge pull request #3604 from Citadel-Station-13/upstream-merge-32048
...
[MIRROR] Adds cogscarab shells and marauder armor into the spawners menu, and tweaks their alerts
2017-10-26 16:51:53 -04:00
f584faee51
Merge pull request #3603 from Citadel-Station-13/upstream-merge-32085
...
[MIRROR] Fixes being able to stack stargazers on one tile
2017-10-26 16:51:05 -04:00
LetterJay