LetterJay
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
LetterJay
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
LetterJay
bea9365ea9
Merge branch 'master' into upstream-merge-32093
2017-10-29 02:27:52 -04:00
LetterJay
e150fe28b6
Merge branch 'master' into upstream-merge-31877
2017-10-28 23:57:51 -04:00
CitadelStationBot
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
LetterJay
0e553b26db
Merge branch 'master' into upstream-merge-31737
2017-10-28 02:20:25 -04:00
Emmett Gaines
ea36d5944e
More radiation balance changes and fixes ( #32051 )
...
* more balance changes and fixes
* cleanup
2017-10-27 03:08:03 -05: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
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
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
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
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
as334
eb4f6326d7
Assmos part 1, #2
2017-10-26 23:12:27 -05: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
KorPhaeron
ef9c27ef0a
Roundstart species pref fixes/removes redundant species config
2017-10-26 12:00:56 -05:00
oranges
28053a603a
Merge pull request #31991 from ShizCalev/reflector-stack-fix
...
fixes reflectors dropping extra mats
2017-10-26 05:03:48 -05:00
ShizCalev
e92dec4e4c
Fixes defib ghost prompt ( #32019 )
...
* Fixes #32013
* proc instead.
2017-10-25 23:42:10 -05:00
Jordan Brown
ddbd1fcf85
--no-edit
2017-10-25 23:38:24 -05:00
Emmett Gaines
ae86a75362
Greyscale cables
2017-10-25 21:46:57 -05:00
Kyle Spier-Swenson
927dea03ce
Fixes excessive overlay churn ( #32065 )
...
* Fixes excessive overlay chern
Adding an overlay on every cross and uncross of every player (with how bloody the station gets this is called on just about every fucking movement, some times multiple times if there are multiple types of stains (oil, blood, alien, etc) is an excessive as fuck amount of chern in the overlay subsystem.
This is likely the cause of overlays being so high.
* I APOLOGIZE FOR NOTHING!
2017-10-25 21:45:46 -05:00
kevinz000
0986857f18
Update crayons.dm ( #32024 )
2017-10-24 08:07:42 -05:00
LetterJay
00da8a2ead
Merge pull request #3575 from deathride58/mapsyncs1
...
Map Syncs - TG-gnawed-on-too-many-cables Edition
2017-10-23 23:02:23 -04:00
duncathan salt
ed12370a73
Atmos construction rework again
2017-10-23 16:29:53 -05:00
LetterJay
fc07e15f61
Merge pull request #3563 from Citadel-Station-13/upstream-merge-31992
...
[MIRROR] Fixes being unable to merge full stacks
2017-10-23 14:52:28 -04:00
LetterJay
c17d1dce40
Merge pull request #3559 from Citadel-Station-13/upstream-merge-31948
...
[MIRROR] Fixes champrojector camera bugs
2017-10-23 14:50:34 -04:00
LetterJay
ce2f1cc672
Merge pull request #3554 from Citadel-Station-13/upstream-merge-31981
...
[MIRROR] Removes mob.lastattacked and replaces lastattacker with a string
2017-10-23 14:48:10 -04:00
LetterJay
23765d9ddd
Update stunbaton.dm
2017-10-23 13:17:35 -05:00
deathride58
c1bd7bc6ba
Map syncs 1 - Code syncs
2017-10-23 12:56:26 -04:00
YPOQ
2c251f929f
Fixes being unable to merge full stacks ( #31992 )
2017-10-23 00:09:29 -05:00
MoreRobustThanYou
5504b4c1e2
Fixes champrojector camera bug ( #31948 )
2017-10-22 17:50:11 -05:00
vuonojenmustaturska
1794018ae1
Removes mob.lastattacked and replaces lastattacker with a string
2017-10-22 11:29:35 -05:00
Firecage
25b5bb3e44
Code Consistency: luminosity --> light_range
2017-10-22 00:06:35 -05:00
Poojawa
62273a3867
Merge branch 'master' into upstream-merge-31737
2017-10-21 07:18:14 -05:00
CitadelStationBot
d25cb1ba5d
[MIRROR] Grammar fixes to atom descriptions ( #3165 )
...
* Grammar fixes to atom descriptions
* compile errors
2017-10-21 07:17:03 -05:00
CitadelStationBot
adc2e46114
[MIRROR] Does some code standardization/consistency. ( #3161 )
...
* Does some code standardization/consistency.
* fixes merge conflict generation
* Missed a few, oops
* Update pierrot_throat.dm
2017-10-21 06:10:22 -05:00
KorPhaeron
e4f76a79a5
Allows species to be blocked from ever being roundstart, can now choose your Halloween species
2017-10-20 10:11:35 -05:00
CitadelStationBot
46a78bc3dd
[MIRROR] Reverts bluespace pipes ( #3513 )
...
* Revert bluespace pipes while keeping fixes from the original PR (#31866 )
These are absurdely overpowered given that they have no research or
material gate
* Reverts bluespace pipes
2017-10-20 01:40:15 -05:00
LetterJay
fe05d8aaaf
Merge pull request #3506 from Citadel-Station-13/upstream-merge-31754
...
[MIRROR] Stops manned turrets from firing when the user unbuckles themselves from the turret
2017-10-19 09:24:04 -04:00
LetterJay
e876293476
Merge pull request #3499 from Citadel-Station-13/upstream-merge-31773
...
[MIRROR] Showers clean contamination and make sound
2017-10-19 09:20:02 -04:00
LetterJay
7ca5646119
Merge pull request #3497 from Citadel-Station-13/upstream-merge-31711
...
[MIRROR] Removes crewpinpointer from wardens locker
2017-10-19 09:14:00 -04:00
LetterJay
9076721384
Merge pull request #3482 from Citadel-Station-13/upstream-merge-31842
...
[MIRROR] GPS renaming fix
2017-10-19 09:05:18 -04:00
vuonojenmustaturska
7045809aa2
Stops manned turrets from firing when the user unbuckles themselves from the turret ( #31754 )
...
* The clown is drunk, and the cards of death wait on him
* Update power.dm
2017-10-19 05:41:41 -05:00
Emmett Gaines
ee3d18fe58
Showers clean contamination and make sound ( #31773 )
...
* fucking showers
* cleanup
2017-10-19 03:29:08 -05:00
jughu
25c37ac9bb
Removes crewpinpointer from wardens locker ( #31711 )
...
* Update security.dm
* Update security.dm
2017-10-19 02:02:25 -05:00
Leo
29e20a55de
Merge pull request #31842 from GunHog/GPS_Name_Fix
...
GPS renaming fix
2017-10-18 07:23:31 -05:00
Leo
060d43768e
Merge pull request #31836 from AnturK/pdalogfix
...
Fixes recipient in pda logs
2017-10-18 07:23:12 -05:00
LetterJay
250f55e072
Merge pull request #3477 from Citadel-Station-13/upstream-merge-31630
...
[MIRROR] Datum rev & related upgrades to base datum antag
2017-10-18 07:42:54 -04:00
LetterJay
799e52c5b0
Merge pull request #3479 from Citadel-Station-13/upstream-merge-31838
...
[MIRROR] Fixes foam layer popping
2017-10-18 07:42:48 -04:00
LetterJay
92fa0ca960
Merge pull request #3473 from Citadel-Station-13/upstream-merge-31809
...
[MIRROR] Cleans up some istypes not using helpers
2017-10-18 07:37:43 -04:00
LetterJay
b89142a35b
Merge pull request #3471 from Citadel-Station-13/upstream-merge-31810
...
[MIRROR] Fixes being able to pick up brass chairs
2017-10-18 07:37:05 -04:00
