deathride58
eeba86e27e
Merge branch 'master' into upstream-merge-32188
2017-11-18 05:31:42 +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
bc1f65b381
Update adminhelp.dm
2017-11-18 00:24:52 -05:00
deathride58
591efe27a3
Update robot_modules.dm
2017-11-18 00:19:35 -05:00
deathride58
49c72a8a91
Update on_move.dm
2017-11-17 23:39:06 -05:00
deathride58
98ce27d0ad
Update cell.dm
2017-11-17 23:37:32 -05:00
deathride58
3cee5f3568
Update pray.dm
2017-11-17 23:36:00 -05:00
deathride58
2d250c9b01
Update playsound.dm
2017-11-17 23:34:31 -05:00
deathride58
9cb06c70f6
Update adminjump.dm
2017-11-17 23:33:22 -05:00
deathride58
b55312613f
Update secrets.dm
2017-11-17 23:31:47 -05:00
deathride58
4bf7fd963d
Update secrets.dm
2017-11-17 23:30:31 -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
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
Dax Dupont
e3f172d999
Fixes hydroponics not properly dealing with fluorine ( #32813 )
...
fluorine was misspelled
2017-11-17 12:50:11 -06:00
CitadelStationBot
0d8d2c50da
[MIRROR] Remove shocker circuit ( #3983 )
...
* Remove shocker circuit (#32758 )
* Remove shocker circuit
2017-11-17 00:24:50 -08:00
CitadelStationBot
1453373770
[MIRROR] Nerfs power regen on the regular tesla relay circuit. ( #3980 )
...
* Nerfs power regen on the regular tesla relay circuit. (#32782 )
* nerfed power regen on both variants of tesla circuit
* lines
* ill show you consistency
* Nerfs power regen on the regular tesla relay circuit.
2017-11-17 00:24:36 -08:00
Jordie
b7e99a7448
JSON feedback
2017-11-17 01:44:12 -06:00
kevinz000
8cf1266b72
[s] Sanitizes text input/output in circuits ( #32833 )
...
* Adds Sanitization to TTS
* Sanitize input
* stripped_input
* strip debugger input
* Stripped inputs in pin inputs.
* stripped pin input
* stripped string pin input
* stripped char input pin.
2017-11-17 00:36:29 -06:00
deathride58
706e691fef
Merge pull request #3981 from Citadel-Station-13/upstream-merge-32778
...
[MIRROR] Makes you turn when pulling and adds sound to rolling bed and chair
2017-11-17 04:52:22 +00:00
deathride58
792f16ebd6
Merge pull request #3969 from Citadel-Station-13/upstream-merge-32622
...
[MIRROR] Fix conflicts between helmet/mech HUDs and HUD glasses
2017-11-17 04:49:10 +00:00
deathride58
8fcf4dde02
Merge pull request #3975 from Citadel-Station-13/upstream-merge-32783
...
[MIRROR] Prevents proximity sensors from beeping when unarmed.
2017-11-17 02:06:31 +00:00
deathride58
886ad3d7a1
Merge pull request #3968 from Citadel-Station-13/upstream-merge-32744
...
[MIRROR] Fixes changeling egg when slug destroyed
2017-11-17 02:05:08 +00:00
deathride58
41e1c38319
Merge pull request #3979 from Citadel-Station-13/upstream-merge-32791
...
[MIRROR] Grammar fixes on trig circuits
2017-11-17 02:02:18 +00:00
deathride58
458dbeaddf
Merge pull request #3978 from Citadel-Station-13/upstream-merge-32789
...
[MIRROR] Grammar fix on the logic gates
2017-11-17 02:01:48 +00:00
deathride58
858da24743
Merge pull request #3977 from Citadel-Station-13/upstream-merge-32790
...
[MIRROR] Grammar fixes on list circuits
2017-11-17 02:01:15 +00:00
deathride58
8e3bf4d248
Merge pull request #3976 from Citadel-Station-13/upstream-merge-32792
...
[MIRROR] Grammar fixes on output circuits.
2017-11-17 02:00:26 +00:00
deathride58
b41a0f8923
Merge pull request #3974 from Citadel-Station-13/upstream-merge-32785
...
[MIRROR] Grammar checks circuit hypospray
2017-11-17 01:59:37 +00:00
nicbn
df514d7411
Makes you turn when pulling and adds sound to rolling bed and chair ( #32778 )
...
* Makes you turn at what you are pulling and adds sound to rolling bed and chair
* ShizCalev's sound
2017-11-16 18:44:05 -06:00
Iamgoofball
078e4a09b1
Grammar fixes on trig circuits ( #32791 )
...
* Grammar fixes on trig circuits
* Update trig.dm
2017-11-16 18:36:36 -06:00
Iamgoofball
51c4f2667a
Grammar fix on the logic gates ( #32789 )
2017-11-16 18:35:25 -06:00
Iamgoofball
3daa75a240
Grammar fixes on list circuits ( #32790 )
2017-11-16 18:35:17 -06:00
Iamgoofball
6727273613
Grammar fixes on output circuits. ( #32792 )
...
* Grammar fixes on outputs
* Update output.dm
* Update output.dm
* Update output.dm
* Update output.dm
2017-11-16 18:34:06 -06:00
Dax Dupont
ac23bd3261
Prevents proximity sensors from beeping when off. ( #32783 )
2017-11-16 17:10:11 -06:00
Anonmare
d648d971f7
Grammar checks circuit hypospray ( #32785 )
2017-11-16 17:09:00 -06:00
Matt Smith
fc90cf5344
Removed unused HTML tags ( #32787 )
2017-11-16 17:08:51 -06:00
vuonojenmustaturska
6ce69fb2c8
Replaces a bunch of mob loops with hopefully better ones
2017-11-16 16:09:15 -06:00
oranges
952fa2a0f2
Fix conflicts between helmet/mech HUDs and HUD glasses
2017-11-16 15:39:15 -06:00
oranges
2099954f7a
Merge pull request #32744 from JJRcop/last_res--oh
...
Fixes changeling egg when slug destroyed
2017-11-16 15:35:56 -06:00
deathride58
9e12843794
Merge pull request #3965 from Citadel-Station-13/upstream-merge-32753
...
[MIRROR] Smoke circuit only notifies admins on first use and reagent change
2017-11-16 17:26:52 +00:00
deathride58
6cfe16000d
Merge pull request #3961 from Citadel-Station-13/upstream-merge-32742
...
[MIRROR] New vent and scrubber sprites
2017-11-16 17:25:55 +00:00
Jordie
eaa1d752a8
Merge pull request #32753 from optimumtact/wegetityouvape
...
Smoke circuit only notifies admins on first use and reagent change
2017-11-16 02:11:24 -06:00
ike709
1babecaf3c
New vent and scrubber sprites ( #32742 )
...
* New vent and scrubber sprites
* Readds OFF and siphon arrow to map sprites
2017-11-15 19:09:21 -06:00
Tad Hardesty
5abfb077bd
Fix Create Object/Turf/Mob all having the same title ( #32747 )
2017-11-15 19:06:51 -06:00
LetterJay
286442cf4a
Merge pull request #3833 from Citadel-Station-13/upstream-merge-32183
...
[MIRROR] Ling datum antag standarization.
2017-11-15 15:00:46 -06:00
LetterJay
1dd3e337f8
Merge pull request #3956 from Citadel-Station-13/cleanup
...
Cleans up shit in the admin panel
2017-11-15 14:57:12 -06:00
LetterJay
30394c5da5
Merge branch 'master' into upstream-merge-32757
2017-11-15 13:01:55 -06:00
LetterJay
a90a1d8eca
Update player_panel.dm
2017-11-15 12:20:30 -06:00
LetterJay
d899fadd18
missed this during the REF purge
2017-11-15 12:17:49 -06:00
