deathride58
344e462153
Merge pull request #4024 from Citadel-Station-13/upstream-merge-32883
...
[MIRROR] Fixes tendril-related things failing to qdel because of chasm shenanigans
2017-11-20 05:07:27 +00:00
deathride58
4687c8498a
Merge pull request #4023 from Citadel-Station-13/upstream-merge-32886
...
[MIRROR] Fixes incorrect to_chat usage
2017-11-20 05:06:25 +00:00
deathride58
be1f113a12
Merge pull request #4020 from Citadel-Station-13/upstream-merge-32876
...
[MIRROR] Actually fixes the glowshroom runtime
2017-11-20 05:03:35 +00:00
deathride58
d200169b0c
Merge pull request #4018 from Citadel-Station-13/upstream-merge-32869
...
[MIRROR] Fixes whiteship ruin board swap
2017-11-20 05:01:13 +00:00
deathride58
9d77fb560e
Merge pull request #4017 from Citadel-Station-13/upstream-merge-32871
...
[MIRROR] Transfers orbiting ghosts on most common transforms
2017-11-20 05:00:42 +00:00
deathride58
d7cfc464ff
Merge pull request #4012 from Michiyamenotehifunana/foamexploit-fix
...
Patches Infinite Material Exploits
2017-11-20 04:59:39 +00:00
Jordie
7ca6c282f3
Merge pull request #32883 from vuonojenmustaturska/tendrilqdel
...
Fixes tendril-related things failing to qdel because of chasm shenanigans
2017-11-19 22:29:41 -06:00
Jordie
aea39fdd49
Merge pull request #32886 from ShizCalev/to_chat
...
Fixes incorrect to_chat usage
2017-11-19 22:26:28 -06:00
oranges
326c87904a
Merge pull request #32876 from vuonojenmustaturska/glowshrooms
...
Actually fixes the glowshroom runtime
2017-11-19 21:24:51 -06:00
ShizCalev
ede0a105e5
Fixes whiteship ruin board swap ( #32869 )
2017-11-19 21:04:11 -06:00
Leo
61501988cb
Merge pull request #32871 from AnturK/orbitclean
...
Transfers orbiting ghosts on most common transforms
2017-11-19 17:13:08 -06:00
oranges
808e11b414
Merge pull request #32852 from AutomaticFrenzy/patch/hud-fix
...
Fix HUDs being over-added on Login and over-removed by silicons
2017-11-19 15:16:42 -06:00
Michiyamenotehifunana
de05bd6896
no moar infinite metal
2017-11-19 16:57:47 +08:00
deathride58
ac4ca767d0
Merge pull request #3987 from deathride58/manualmirror1
...
Manual mirror of https://github.com/tgstation/tgstation/pull/32496
2017-11-19 07:47:33 +00:00
deathride58
3dcd88b975
Merge pull request #4009 from Citadel-Station-13/upstream-merge-32788
...
[MIRROR] Fixes inconsistencies w/ energy descriptions
2017-11-19 05:16:15 +00:00
deathride58
711ca534d9
Merge pull request #4010 from Citadel-Station-13/upstream-merge-32851
...
[MIRROR] Fixes suicidal blobbernauts
2017-11-19 04:33:08 +00:00
deathride58
6a05a54c96
Update cell.dm
2017-11-18 23:31:32 -05:00
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
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
KorPhaeron
47b9cc2051
Fixes suicidal blobbernauts ( #32851 )
...
* Fixes suicidal blobbernauts
* Removes notransform
2017-11-18 18:37:50 -06:00
ShizCalev
c2000cc31a
Fixes inconsistencies w/ energy descriptions
2017-11-18 14:18:14 -06:00
checkraisefold
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
Jordan Brown
8b7e3b7b7c
Fixes topic logs exposing serviceCommsKey ( #32837 )
2017-11-18 13:52:08 -06:00
arsserpentarium
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
AnturK
e5edaa4656
Fixes setup failure edge case ( #32812 )
2017-11-18 13:51:40 -06:00
JJRcop
ca9834613c
Removes duplicate data for ai airlock menu ( #32843 )
2017-11-18 13:51:27 -06:00
ShizCalev
88da7f3d30
Cleans up unused circuitry code ( #32840 )
2017-11-18 13:51:14 -06:00
Tad Hardesty
3914765c70
Fix runtimes when stacking pizza boxes ( #32831 )
2017-11-18 13:51:01 -06:00
deathride58
a8783e5d1f
Merge branch 'master' into upstream-merge-32823
2017-11-18 06:06:14 +00:00
deathride58
1d841ce65a
Merge pull request #3994 from Citadel-Station-13/upstream-merge-32736
...
[MIRROR] RPD ui improvements
2017-11-18 05:40:13 +00:00
deathride58
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
deathride58
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
deathride58
5f055aa492
Update vent_scrubber.dm
2017-11-18 00:36:11 -05:00
deathride58
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
deathride58
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
deathride58
bb690b24ba
Update cit_crewobjectives_science.dm
2017-11-17 23:45:20 -05:00
deathride58
afce3e01b7
sHIT WRONG BRANCH - undoes edit
2017-11-17 23:43:48 -05:00
deathride58
cf34b64266
Update cit_crewobjectives_science.dm
2017-11-17 23:42:43 -05:00
deathride58
d202867730
Update carbon.dm
2017-11-17 23:23:13 -05:00
deathride58
f1818eb11b
Update death.dm
2017-11-17 23:22:02 -05:00
deathride58
127846549d
Update mass_hallucination.dm
2017-11-17 23:21:13 -05:00
deathride58
38f7b829c3
Update manifest.dm
2017-11-17 23:20:44 -05:00
deathride58
e478e5640a
Update tracking.dm
2017-11-17 23:20:15 -05:00
deathride58
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
CitadelStationBot
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
duncathan salt
52fc5e8bc6
RPD ui improvements
2017-11-17 18:03:56 -06:00
