Commit Graph

6215 Commits

Author SHA1 Message Date
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
Dax Dupont
e3f172d999 Fixes hydroponics not properly dealing with fluorine (#32813)
fluorine was misspelled
2017-11-17 12:50:11 -06:00
oranges
a637da3b0f Add the ability to osay from the viewvar dropdown (#32804) 2017-11-17 03:49:08 -06:00
CitadelStationBot
43f49c74ee [MIRROR] adds 1 gbp to armhulen's account (grammar fix) (#3936)
* adds 1 gbp to armhulen's account (grammar fix)

* Update mind.dm

* Update mind.dm
2017-11-17 00:29:40 -08: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
CitadelStationBot
fd12953f10 [MIRROR] New -> Initialize (#3972)
* New -> Initialize (#32777)

* New -> Initialize

* Remove loc from Initialize

* New -> Initialize
2017-11-17 00:24:02 -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
9057436da3 Update odysseus.dm 2017-11-16 23:32:17 -05: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
0e0eb351b3 Merge pull request #3707 from Citadel-Station-13/upstream-merge-32221
[MIRROR] Fixes allow_custom_shuttles default
2017-11-16 17:34:22 +00:00
deathride58
20ebbce73b Merge pull request #3966 from Citadel-Station-13/upstream-merge-32650
[MIRROR] Speeds up saycode by almost doubling get_hearers_in_view() performance
2017-11-16 17:28:05 +00: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
f6e4e77b80 Merge pull request #3962 from Citadel-Station-13/upstream-merge-32743
[MIRROR] Fixes pipe dispensers being unable to dispense bent pipes
2017-11-16 17:26:18 +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
deathride58
8f34c6cc0c Merge pull request #3960 from Citadel-Station-13/upstream-merge-32748
[MIRROR] Fixes cell charger animation
2017-11-16 17:25:23 +00:00
deathride58
0b1043a739 Merge pull request #3959 from Citadel-Station-13/upstream-merge-32750
[MIRROR] actually use disable_warning mob_can_equip
2017-11-16 17:24:58 +00:00
vuonojenmustaturska
23f2815bb7 Speeds up saycode by almost doubling get_hearers_in_view() performance (#32650)
* The sun is also a warrior

* Knowledge can also destroy

* nor can the kindest will preserve you from the kill
2017-11-16 05:09:20 -06: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
ACCount
1b9280776e Fixes pipe dispensers being unable to dispense bent pipes (#32743)
* Fixes pipe dispensers not dispensing bent pipes

* Updates meter RPD icon file to the one that's actually used
2017-11-15 19:12:34 -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