711ca534d9
Merge pull request #4010 from Citadel-Station-13/upstream-merge-32851
...
[MIRROR] Fixes suicidal blobbernauts
2017-11-19 04:33:08 +00:00
6a05a54c96
Update cell.dm
2017-11-18 23:31:32 -05:00
75adfdc245
Merge pull request #4008 from Citadel-Station-13/upstream-merge-32814
...
[MIRROR] fix 'cannot scream while unconscious' bug
2017-11-19 04:29:07 +00:00
8c64f1cc49
Merge pull request #4006 from Citadel-Station-13/upstream-merge-32837
...
[MIRROR] Fixes topic logs exposing serviceCommsKey
2017-11-19 04:28:21 +00:00
68d9e90f96
Merge pull request #4005 from Citadel-Station-13/upstream-merge-32811
...
[MIRROR] Fix for list pin in integrated circuits
2017-11-19 04:27:43 +00:00
2faceb1209
Merge pull request #4004 from Citadel-Station-13/upstream-merge-32812
...
[MIRROR] Fixes setup failure edge case
2017-11-19 04:26:49 +00:00
7f7d282383
Merge pull request #4003 from Citadel-Station-13/upstream-merge-32843
...
[MIRROR] Removes duplicate data for ai airlock menu
2017-11-19 04:26:15 +00:00
a00a82c1a2
Merge pull request #4002 from Citadel-Station-13/upstream-merge-32840
...
[MIRROR] Cleans up unused circuitry code
2017-11-19 04:25:43 +00:00
47b9cc2051
Fixes suicidal blobbernauts ( #32851 )
...
* Fixes suicidal blobbernauts
* Removes notransform
2017-11-18 18:37:50 -06:00
c2000cc31a
Fixes inconsistencies w/ energy descriptions
2017-11-18 14:18:14 -06:00
e3036f6eae
fix 'cannot scream while unconscious' bug ( #32814 )
...
* fix 'cannot scream while unconscious' bug
fixes a bug where it tells you that you can't scream while unconscious while on fire (experienced on Bagil when a plasma fire happened at endround shuttle)
* Update species.dm
* sanitize code
* add the comment back so people know what it doin
* change operator
other one wouldn't work with the fix, the screaming is supposed to happen while you're in crit
2017-11-18 13:52:36 -06:00
8b7e3b7b7c
Fixes topic logs exposing serviceCommsKey ( #32837 )
2017-11-18 13:52:08 -06:00
15c65004ca
Fix for list pin in integrated circuits ( #32811 )
...
* Update lists.dm
* Update pins.dm
* Update list_pin.dm
* Update power.dm
* Update input.dm
* Update pins.dm
* Update list_pin.dm
* Update input.dm
* Update lists.dm
* Update power.dm
* Update input.dm
* Update power.dm
2017-11-18 13:51:53 -06:00
e5edaa4656
Fixes setup failure edge case ( #32812 )
2017-11-18 13:51:40 -06:00
ca9834613c
Removes duplicate data for ai airlock menu ( #32843 )
2017-11-18 13:51:27 -06:00
88da7f3d30
Cleans up unused circuitry code ( #32840 )
2017-11-18 13:51:14 -06:00
3914765c70
Fix runtimes when stacking pizza boxes ( #32831 )
2017-11-18 13:51:01 -06:00
a8783e5d1f
Merge branch 'master' into upstream-merge-32823
2017-11-18 06:06:14 +00:00
1d841ce65a
Merge pull request #3994 from Citadel-Station-13/upstream-merge-32736
...
[MIRROR] RPD ui improvements
2017-11-18 05:40:13 +00:00
a15007cd5a
Merge pull request #3992 from Citadel-Station-13/upstream-merge-32761
...
[MIRROR] Tweaks AI door open and close buttons
2017-11-18 05:39:22 +00:00
04d290aa11
Merge pull request #3967 from Citadel-Station-13/upstream-merge-32775
...
[MIRROR] Makes the operation computer tgui
2017-11-18 05:38:59 +00:00
5f055aa492
Update vent_scrubber.dm
2017-11-18 00:36:11 -05:00
d034e7dbf2
Merge pull request #3964 from Citadel-Station-13/upstream-merge-32746
...
[MIRROR] Atmos Filter/Scrubber UI update
2017-11-18 05:35:27 +00:00
eeba86e27e
Merge branch 'master' into upstream-merge-32188
2017-11-18 05:31:42 +00:00
9e78bcd8f9
Merge pull request #3971 from Citadel-Station-13/upstream-merge-32786
...
[MIRROR] Replaces a bunch of mob loops with hopefully better ones
2017-11-18 05:29:32 +00:00
bc1f65b381
Update adminhelp.dm
2017-11-18 00:24:52 -05:00
c98faf5bb5
Update _cit_helpers.dm
2017-11-18 00:23:19 -05:00
591efe27a3
Update robot_modules.dm
2017-11-18 00:19:35 -05:00
bb690b24ba
Update cit_crewobjectives_science.dm
2017-11-17 23:45:20 -05:00
afce3e01b7
sHIT WRONG BRANCH - undoes edit
2017-11-17 23:43:48 -05:00
cf34b64266
Update cit_crewobjectives_science.dm
2017-11-17 23:42:43 -05:00
49c72a8a91
Update on_move.dm
2017-11-17 23:39:06 -05:00
98ce27d0ad
Update cell.dm
2017-11-17 23:37:32 -05:00
3cee5f3568
Update pray.dm
2017-11-17 23:36:00 -05:00
2d250c9b01
Update playsound.dm
2017-11-17 23:34:31 -05:00
9cb06c70f6
Update adminjump.dm
2017-11-17 23:33:22 -05:00
b55312613f
Update secrets.dm
2017-11-17 23:31:47 -05:00
4bf7fd963d
Update secrets.dm
2017-11-17 23:30:31 -05:00
eea00b4d85
Update wizard.dm
2017-11-17 23:29:09 -05:00
a0d70d8823
Update traitor.dm
2017-11-17 23:28:09 -05:00
7b244b40fb
Update changeling.dm
2017-11-17 23:25:20 -05:00
d202867730
Update carbon.dm
2017-11-17 23:23:13 -05:00
f1818eb11b
Update death.dm
2017-11-17 23:22:02 -05:00
127846549d
Update mass_hallucination.dm
2017-11-17 23:21:13 -05:00
38f7b829c3
Update manifest.dm
2017-11-17 23:20:44 -05:00
e478e5640a
Update tracking.dm
2017-11-17 23:20:15 -05:00
674cce2d85
Merge pull request #3986 from Citadel-Station-13/upstream-merge-32804
...
[MIRROR] Add the ability to osay from the viewvar dropdown
2017-11-18 04:15:58 +00:00
7669ea4820
and copypasta falls out of my pocket
2017-11-17 22:14:09 -05:00
0beef30fb7
Adds a purple bartender suit and apron, and Long Hair 3 - Requested and sprites by Okand37! ( #3993 )
2017-11-17 19:02:40 -08:00
fb62491701
manual map syncs + manual missed pr mirrors
2017-11-17 21:34:49 -05:00
deathride58