shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,137 Commits 5 Branches 0 Tags
3dcd88b9753cc85404ce28bdb725c408cfb80ca3
Commit Graph

3568 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
duncathan salt
52fc5e8bc6 RPD ui improvements 2017-11-17 18:03:56 -06:00
duncathan salt
8bc84c23db fixes scrubbers being unable to scrub 2017-11-17 12:50:42 -06: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
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
duncathan salt
043e689108 Atmos Filter/Scrubber UI update 2017-11-15 21:38:57 -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