shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,057 Commits 5 Branches 0 Tags
244e82355823e28dfd297584ee1485b67f047ac5
Commit Graph

3544 Commits

Author SHA1 Message Date
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
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
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
LetterJay
9849b9a13b Merge pull request #3912 from Citadel-Station-13/upstream-merge-32482 
[MIRROR] Improves the deep fryer
 2017-11-15 11:13:56 -06:00
LetterJay
2715fd1b6c Merge pull request #3950 from deathride58/slimernosliming 
Re-disables slimeperson splitting
 2017-11-15 10:54:51 -06:00
LetterJay
9ec256632a Merge pull request #3949 from Citadel-Station-13/upstream-merge-32569 
[MIRROR] [512] Makes gas mouse transparent
 2017-11-15 10:51:35 -06:00
LetterJay
163ef812fb Merge pull request #3945 from Citadel-Station-13/upstream-merge-32702 
[MIRROR] Minor speedups to movement: First Blood Part 2
 2017-11-15 10:41:16 -06:00
LetterJay
2f71e0f724 Merge pull request #3944 from Citadel-Station-13/upstream-merge-32714 
[MIRROR] Tesla no longer NOTHING PERSONNEL's the power beacon
 2017-11-15 10:40:59 -06:00
LetterJay
46ba6cbc7b Merge pull request #3943 from Citadel-Station-13/upstream-merge-32620 
[MIRROR] Greatly increases the performance of station-ending plasma fires
 2017-11-15 10:40:40 -06:00
LetterJay
37085ee10e Merge pull request #3930 from Citadel-Station-13/upstream-merge-32723 
[MIRROR] Makes cryoxadone heal clone damage again
 2017-11-15 10:40:13 -06:00
LetterJay
853e9a0ed5 Merge pull request #3918 from Citadel-Station-13/upstream-merge-32280 
[MIRROR] Performance and usability improvement for blueprints
 2017-11-15 10:39:40 -06:00
LetterJay
668248b987 combines the missed microwave PR 2017-11-15 10:31:41 -06:00
LetterJay
3c28ea5426 Merge pull request #3713 from Citadel-Station-13/upstream-merge-32277 
[MIRROR] Removes golem debug code that spams world
 2017-11-15 10:30:31 -06:00
LetterJay
1939e96bb6 Merge branch 'master' into upstream-merge-32183 2017-11-15 10:22:40 -06:00
LetterJay
16019df886 Merge branch 'master' into upstream-merge-32280 2017-11-15 10:21:04 -06:00
Emmett Gaines
ab21f8d5ed 511 client fix and a config to make the version warning a popup 2017-11-15 04:39:36 -06:00
deathride58
f1274b41f2 redisables slime splitting 2017-11-14 19:27:19 -05:00
Emmett Gaines
9b75113631 [512] Makes gas mouse transparent (#32569) 
* Makes gas mouse transparent

* readability cleanup

* future proofing
 2017-11-14 17:47:01 -06:00
LetterJay
0885c57b39 Update mob.dm 2017-11-14 16:10:46 -06:00
LetterJay
809951c56c Merge pull request #3326 from Citadel-Station-13/upstream-merge-31176 
[MIRROR] loc -- > forcemove
 2017-11-14 15:58:20 -06:00
LetterJay
44d15b07fb Merge pull request #3942 from Citadel-Station-13/upstream-merge-32607 
[MIRROR] Alt clicking additions
 2017-11-14 15:57:06 -06:00