shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,982 Commits 5 Branches 0 Tags
ac6fddcfb3cf430b465dddd9c08d418fa08cd51e
Commit Graph
1046 Commits
Author SHA1 Message Date
deathride58 ac6fddcfb3 Merge remote-tracking branch 'upstream/master' into hopefullythefinalhardsync 2018-07-05 00:17:44 -04:00
CitadelStationBotandkevinz000 06d08c67c3 [MIRROR] Makes tear in the fabric of reality inaccessible until a boh bomb is detonated (#7327) 
* Makes tear in the fabric of reality inaccessible until a boh bomb is detonated (#38852)

* a commit message

* reviews addressed?

* Makes tear in the fabric of reality inaccessible until a boh bomb is detonated
 2018-07-04 18:38:53 -07:00
CitadelStationBotandkevinz000 0500be9b35 [MIRROR] Fixes some shard harddel stuff. (#7299) 
* Fixes some shard harddel stuff. (#38799)

* Fixes some shard harddel stuff.
 2018-07-02 06:44:50 -07:00
deathride58 91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04:00
ShizCalevandletterjay 452b34caa2 Cleans up leftover telesci teleporter code (#38789) 2018-07-01 05:43:43 -05:00
kevinz000andGitHub bae1993861 Update pipe_dispenser.dm 2018-06-25 06:19:30 -07:00
LetterJayandGitHub 8f7ca9fbba Merge pull request #7211 from Citadel-Station-13/upstream-merge-38534 
[MIRROR] Fixes AI's being unable to call shuttle using comm console.
 2018-06-24 15:16:09 -05:00
CitadelStationBotandkevinz000 386bc528ea [MIRROR] Add logging to teleport and the teleporter destination setting (#7225) 
* Add logging to teleport and the teleporter destination setting (#38645)

Helps with some admin issues

* Add logging to teleport and the teleporter destination setting
 2018-06-22 00:34:41 -07:00
CitadelStationBotandkevinz000 3d1faff99b [MIRROR] Adds desc to IV drips (#7205) 
* Merge pull request #38608 from 81Denton/iv-drip-desc

Adds desc to IV drips

* Adds desc to IV drips
 2018-06-20 22:39:29 -07:00
AnturKandletterjay 5e156e7a07 Fixes AI's being unable to call shuttle using comm console. (#38534) 
* Fixes AI's being unable to call shuttle using comm console.

* Lets get rid of double negatives

* viewvers for
 2018-06-20 19:39:17 -05:00
CitadelStationBotandkevinz000 25ba25d997 [MIRROR] [s]Fixed being able to create nearly infinite amount of materials from autolathes (#7199) 
* [s]Fixed being able to create nearly infinite amount of materials from autolathes (#38624)

* clamper-oni

* Update autolathe.dm

* Update autolathe.dm

* [s]Fixed being able to create nearly infinite amount of materials from autolathes
 2018-06-20 17:23:02 -07:00
CitadelStationBotandkevinz000 db25067491 adds missing /'s at the starts of some obj instances (#7169) 2018-06-18 11:53:33 -07:00
CitadelStationBotandkevinz000 03a22ca16d [MIRROR] Transit space refactor (#7130) 
* Transit space refactor

* Update bitfields.dm
 2018-06-18 11:51:02 -07:00
LetterJayandGitHub c58dbc1110 Merge pull request #7138 from Citadel-Station-13/upstream-merge-38476 
[MIRROR] [s] Fix launchpads creating way too many sparks
 2018-06-18 10:09:42 -05:00
Jordan Brownandletterjay e95851c8f6 Merge pull request #38476 from AutomaticFrenzy/patch/sparks 
[s] Fix launchpads creating way too many sparks
 2018-06-16 15:53:42 -05:00
Jordan Brownandletterjay c25971d569 Merge pull request #38493 from ShizCalev/typo-fix 
Corrects typos
 2018-06-16 06:19:20 -05:00
CitadelStationBotandkevinz000 95a9942bdc [MIRROR] Fixes cloning not working on those qdel'd but not yet destroyed by the garbage collector (#7105) 
* Cloning deletion fix (#38438)

* Fixes cloning not working on those qdel'd but not yet destroyed by the garbage collector
 2018-06-15 02:48:10 -07:00
CitadelStationBotandkevinz000 496a1d1165 [MIRROR] [s] Fixes sleeper logging. (#7085) 
* Merge pull request #38429 from AnturK/runtimeA

[s] Fixes sleeper logging.

* [s] Fixes sleeper logging.
 2018-06-12 17:23:37 -07:00
LetterJayandGitHub 87cc0e6c6f Merge pull request #7067 from Citadel-Station-13/upstream-merge-38360 
[MIRROR] Cleans up some logging
 2018-06-12 07:41:10 -05:00
orangesandletterjay 1d0f775f56 Merge pull request #38360 from ShizCalev/key-cleanup 
Cleans up some logging
 2018-06-11 22:29:27 -05:00
orangesandletterjay ffd705c8d7 Merge pull request #38366 from AutomaticFrenzy/patch/fire-overlay 
Replace area-wide fire overlay with reddening the lights
 2018-06-11 22:29:10 -05:00
ShizCalevandletterjay 849c33f9bf Adds logging for sleeper chem injections (#38396) 2018-06-11 00:04:21 -05:00
CitadelStationBotandkevinz000 2a727c6df2 [MIRROR] Removes unused overview code. (#7054) 
* Merge pull request #38361 from AnturK/yeahno

Removes unused overview code.

* Removes unused overview code.
 2018-06-10 12:31:19 -07:00
CitadelStationBotandkevinz000 6510066918 [MIRROR] Logs minor and major crimes (#7053) 
* Merge pull request #38358 from nfreader/record_crimes

Logs minor and major crimes

* Logs minor and major crimes
 2018-06-10 12:29:15 -07:00
deathride58andGitHub e279392386 Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128 
[MIRROR] Standardizes and cleans up some admin messages & logging
 2018-06-09 05:53:25 +00:00
deathride58andGitHub 38878094bc Merge pull request #6982 from Citadel-Station-13/upstream-merge-38264 
[MIRROR] Fix autoprocessing cloners
 2018-06-09 05:13:23 +00:00
deathride58andGitHub 5858b790d7 Update cloning.dm 2018-06-09 00:34:01 -04:00
81Dentonandletterjay 16c05b0d92 adds warning to shuttle purchase menu (#38266) 2018-06-07 20:32:38 -05:00
AnturKandletterjay 717e635d28 Fixes some holocall stuff (#38209) 
* Fixes some holocall stuff

* Yep
 2018-06-06 14:25:23 -05:00
deathride58andGitHub b49458e0ba Merge branch 'master' into upstream-merge-38116 2018-06-05 21:30:21 +00:00
deathride58andGitHub cff10c62d0 Update cloning.dm 2018-06-05 17:24:15 -04:00
81Dentonandletterjay 2fb5bb10b5 Arcade reward: snack rigs (#38268) 
* chew you havisfaction a singlelicious satisfact to snack that up?

* random snack spawn and sponsor name

* static list/initialize
 2018-06-05 13:27:39 -05:00
LetterJayandGitHub 5997b69de1 Merge pull request #6995 from Citadel-Station-13/upstream-merge-38240 
[MIRROR] Replaces airlock_controller/incinerator related varedits with defines/subtypes
 2018-06-05 12:11:34 -05:00
LetterJayandGitHub b94207ed11 Merge pull request #6994 from Citadel-Station-13/upstream-merge-38223 
[MIRROR] Slight changes to camera network code
 2018-06-05 12:11:19 -05:00
deathride58andGitHub 8157233145 Update airlock_control.dm 2018-06-03 22:19:52 -04:00
LetterJayandGitHub 2c6c5bc5d2 Merge pull request #6998 from Citadel-Station-13/upstream-merge-38249 
[MIRROR] Fixes comms consoles thinking the transit is on centcom
 2018-06-03 16:21:19 -05:00
vuonojenmustaturskaandletterjay 83cf30c92e oh ho (#38249) 2018-06-03 11:45:43 -05:00
81Dentonandletterjay 0d42b1c4d1 Replaces airlock_controller/incinerator related varedits with defines/subtypes 2018-06-03 11:03:14 -05:00
Jalleoandletterjay d3f34517dc Slight changes to camera network code 2018-06-03 09:04:24 -05:00
ShizCalevandletterjay 67841c3f19 Fixes pocket items being deleted when monkeyizing (#38220) 2018-06-03 09:04:08 -05:00
Tad Hardestyandletterjay 5173ac3211 Fix autoprocessing cloners 2018-06-03 09:02:20 -05:00
LetterJayandGitHub 93e232104d Update embedded_controller_base.dm 2018-06-02 07:33:52 -05:00
LetterJayandGitHub a3febc120d Update airlock_control.dm 2018-06-02 07:33:31 -05:00
LetterJayandGitHub 5646dd794b Merge pull request #6973 from Citadel-Station-13/upstream-merge-38180 
[MIRROR] Fix family heirloom being lost on cloning
 2018-06-02 07:29:17 -05:00
Jordan Brownandletterjay 5e15a988f6 Refactor machinery to default to being anchored 2018-06-01 11:28:19 -05:00
Jordan Brownandletterjay f2124aa3cf Merge pull request #38180 from AutomaticFrenzy/patch/heirloom-clone 
Fix family heirloom being lost on cloning
 2018-06-01 09:51:08 -05:00
Cruixandletterjay 9c4f4ce17f AI Multicamera mode (#37695) 
* Added multicamera mode for AIs

* Minor multicamera fixes

* Cameras near an AI multicamera eye now light up red

* Disabled AI multicamera mode without admin intervention

* Fixed AIs being able to use multicamera mode when they should not
 2018-05-31 22:41:48 -05:00
ShizCalevandletterjay 4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -05:00
deathride58andkevinz000 2f9e3e403d Hard upstream sync (#6951) 
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
 2018-05-31 16:03:18 -07:00
LetterJayandGitHub 761035b391 Merge pull request #6901 from Citadel-Station-13/upstream-merge-37960 
[MIRROR] Fix some inconsistencies relating to resting
 2018-05-27 14:39:18 -05:00