LetterJay
d4e794eef7
Update furrypeople.dm
2017-10-29 00:47:25 -05:00
LetterJay
180e730be9
Update species.dm
2017-10-29 00:46:15 -05:00
LetterJay
78da30ec8d
Update species.dm
2017-10-29 00:25:17 -05:00
LetterJay
c64446962d
Merge branch 'master' into upstream-merge-32096
2017-10-28 03:47:08 -04:00
LetterJay
a221d3505f
Update DNA.dm
2017-10-28 02:19:08 -05:00
LetterJay
6172cd38bd
Merge pull request #3628 from Citadel-Station-13/upstream-merge-32087
...
[MIRROR] Halloween Tweaks
2017-10-28 03:16:43 -04:00
LetterJay
0e553b26db
Merge branch 'master' into upstream-merge-31737
2017-10-28 02:20:25 -04:00
LetterJay
79d6f42dfd
conflicts
2017-10-28 01:16:26 -05:00
LetterJay
fb5863ba35
Merge pull request #3630 from deathride58/adminhelphandlebutton
...
Adds a "Handle Issue" button to ahelps
2017-10-27 16:33:21 -04:00
LetterJay
39f683ab8d
Update meteor_wave.dm
2017-10-27 15:32:38 -05:00
LetterJay
12d336cbf0
Update halloween.dm
2017-10-27 15:32:15 -05:00
LetterJay
a5338759b7
donation item
2017-10-27 13:06:53 -05:00
LetterJay
9599dd94c0
Merge pull request #3634 from deathride58/voreproctovoreverb
...
Readds the hook necessary for vore setup
2017-10-27 03:15:22 -04:00
LetterJay
af96c29a0c
Merge pull request #3635 from ktccd/Undo_Borer_HUDS
...
Undoes Borer HUDs
2017-10-27 02:49:03 -04:00
LetterJay
3719319bf3
Merge pull request #3638 from deathride58/dontcodewhiledrunk
...
Fixes miscreant generation
2017-10-27 02:48:26 -04:00
LetterJay
7f6b1a6400
Merge pull request #3637 from deathride58/loocerrorfix
...
Fixes LOOC error messages not appearing in goonchat
2017-10-27 02:48:16 -04:00
LetterJay
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
LetterJay
4ab8e0d8f1
Merge pull request #3625 from Citadel-Station-13/upstream-merge-31987
...
[MIRROR] Inlines and optimizes compile_overlays
2017-10-27 02:44:48 -04:00
LetterJay
31ee6947ee
Merge pull request #3624 from Citadel-Station-13/upstream-merge-32039
...
[MIRROR] Rebalances clockwork marauders
2017-10-27 02:44:17 -04:00
LetterJay
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
LetterJay
ab12387ebd
Merge pull request #3622 from Citadel-Station-13/upstream-merge-32029
...
[MIRROR] Actual performance improvements for GetAllContents
2017-10-27 02:43:16 -04:00
LetterJay
a7b464e47e
Merge pull request #3620 from Citadel-Station-13/upstream-merge-32030
...
[MIRROR] Allows components to qdel from Initialize
2017-10-27 02:19:07 -04:00
LetterJay
9a1db237d2
Merge pull request #3618 from Citadel-Station-13/upstream-merge-32058
...
[MIRROR] Fixes lightgeist spawning
2017-10-27 02:18:48 -04:00
LetterJay
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
LetterJay
6713634146
Merge pull request #3616 from Citadel-Station-13/upstream-merge-32084
...
[MIRROR] Fixes minor runtime
2017-10-27 02:18:02 -04:00
LetterJay
3202baec26
Merge pull request #3615 from Citadel-Station-13/upstream-merge-32075
...
[MIRROR] Makes staff of change randomly assign a borg module
2017-10-27 02:17:45 -04:00
LetterJay
4fee09e236
Merge pull request #3613 from Citadel-Station-13/upstream-merge-32098
...
[MIRROR] Fixes a runtime on organ replacement
2017-10-27 02:16:47 -04:00
LetterJay
3b82c26cb5
Merge pull request #3612 from Citadel-Station-13/upstream-merge-32083
...
[MIRROR] Prevents inappropriate slapping
2017-10-27 02:16:34 -04:00
LetterJay
6b0bb7268e
Merge pull request #3611 from Citadel-Station-13/upstream-merge-31945
...
[MIRROR] Adds ambience to the SM and portable generators
2017-10-27 02:16:02 -04:00
LetterJay
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
LetterJay
4facc9c04e
Update pump.dm
2017-10-27 00:23:13 -05:00
LetterJay
2b699d8d73
Update volume_pump.dm
2017-10-27 00:05:28 -05:00
as334
eb4f6326d7
Assmos part 1, #2
2017-10-26 23:12:27 -05:00
deathride58
df3c60bce5
drunk coding is a horrible idea
2017-10-26 22:54:49 -04:00
LetterJay
646ddb9bc2
Merge pull request #3609 from Citadel-Station-13/upstream-merge-32089
...
[MIRROR] Fixes light source qdel issues.
2017-10-26 16:54:17 -04:00
LetterJay
bdeaa6e886
Merge pull request #3607 from Citadel-Station-13/upstream-merge-32076
...
[MIRROR] Fixes SoC creating braindead aliens
2017-10-26 16:53:40 -04:00
LetterJay
4cc0cf3ee7
Merge pull request #3606 from Citadel-Station-13/upstream-merge-31972
...
[MIRROR] Greyscale cables
2017-10-26 16:53:08 -04:00
LetterJay
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
LetterJay
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
LetterJay
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
1ecd723475
Merge pull request #3597 from Citadel-Station-13/upstream-merge-32071
...
[MIRROR] Fixes heartbeat message spam
2017-10-26 16:50:51 -04:00
deathride58
4fd775ee1d
Fixes LOOC error messages not appearing
2017-10-26 16:28:07 -04:00
ktccd
ad911c2b1b
Undoes Borer HUDs
...
Critical flaw in antag-HUD system prevented proper use, since automatic
reverting of original PR is no longer possible, (Probably due to another
antag-hud being added afterwards), this is a manual one.
2017-10-26 21:19:34 +02:00
deathride58
e7c69850a1
Wait shit what am i doing - fixes voreverbs proper
2017-10-26 14:31:55 -04:00
deathride58
1770341ee3
converts vore verbs to actual verbs
2017-10-26 13:56:10 -04:00
KorPhaeron
9f7a7bcc22
Vampire species for halloween
2017-10-26 11:55:40 -05:00
deathride58
55cad46845
Adds a button to let people ahelping know their issue is being handled
2017-10-26 12:21:28 -04:00
KorPhaeron
00163837de
Halloween Tweaks
2017-10-26 05:20:53 -05:00
oranges
c3dbb8925b
Merge pull request #31987 from Cyberboss/InlineCO
...
May as well shave some yaks
2017-10-26 05:05:09 -05:00
oranges
60102f9b76
Merge pull request #32039 from Xhuis/marauders
...
Rebalances clockwork marauders
2017-10-26 05:03:59 -05:00