shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,415 Commits 5 Branches 0 Tags
48e4f9f8ebe21e4548422b86ffb980fd8b22a714
Commit Graph
1016 Commits
Author SHA1 Message Date
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
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
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
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
LetterJayandGitHub e544f0fe29 Update dance_machine.dm 2018-05-26 21:40:10 -05:00
LetterJayandGitHub ec9b4ef955 Merge pull request #6902 from Citadel-Station-13/upstream-merge-38045 
[MIRROR] Security console fixes
 2018-05-26 21:39:54 -05:00
LetterJayandGitHub 393676aa3e Update dance_machine.dm 2018-05-26 18:39:20 -05:00
Jordan Brownandletterjay d9b07c1f5d Merge pull request #38045 from ShizCalev/id-teleport-fix 
Security console fixes
 2018-05-25 11:01:10 -05:00
Jordan Brownandletterjay 2bcfe00283 Fix some inconsistencies relating to resting 2018-05-25 10:56:47 -05:00
81Dentonandletterjay 52665b744a req_one_access (#38068) 2018-05-25 10:48:00 -05:00
LetterJayandGitHub 273e2aa13d Merge pull request #6865 from Citadel-Station-13/upstream-merge-38000 
[MIRROR] Removes a couple thousand empty lists
 2018-05-25 02:37:18 -05:00
LetterJayandGitHub b89254ced7 Merge pull request #6807 from Citadel-Station-13/upstream-merge-37448 
[MIRROR] [READY]Refactors techwebs to have different types of points - PR HAS NO GAMEPLAY IMPACT
 2018-05-24 11:58:57 -05:00
vuonojenmustaturskaandletterjay 36b3cbe4bf Removes a couple thousand empty lists (#38000) 
door.shockedby
 2018-05-23 21:15:41 -05:00
LetterJayandGitHub e4eb4939b4 Merge pull request #6636 from Citadel-Station-13/upstream-merge-37582 
[MIRROR] Makes more messages pronoun sensitive
 2018-05-23 07:46:26 -05:00
LetterJayandGitHub 130db93543 Merge pull request #6859 from Citadel-Station-13/upstream-merge-37982 
[MIRROR] Fix flipping of trinary pipe fittings and related RPD tooltips
 2018-05-23 06:49:44 -05:00
Tad Hardestyandletterjay 782c893cf4 Fix flipping of trinary pipe fittings and related RPD tooltips (#37982) 2018-05-23 06:33:07 -05:00
ShizCalevandletterjay bb2f79ed7b Fixes gulag teleporter runtime (#37962) 2018-05-23 01:41:24 -05:00
LetterJayandGitHub 5f27ac30c7 Merge branch 'master' into upstream-merge-37582 2018-05-22 07:22:42 -05:00
deathride58andGitHub 2c73811b1f Merge pull request #6829 from Citadel-Station-13/upstream-merge-37955 
[MIRROR] Keep only the most recent airlock autoclose timer
 2018-05-22 02:28:21 +00:00
deathride58andGitHub 32c63c2e70 Merge pull request #6831 from Citadel-Station-13/upstream-merge-37961 
[MIRROR] Enable admin AI interaction for firelocks
 2018-05-22 02:27:39 +00:00
orangesandletterjay 3fd74027c1 Merge pull request #37945 from AutomaticFrenzy/patch/hydroponics-trays 
Fix construction behavior of hydroponics trays
 2018-05-21 16:58:31 -05:00
Jordan Brownandletterjay a3c3052f25 Merge pull request #37961 from AutomaticFrenzy/patch/ai-firelock 
Enable admin AI interaction for firelocks
 2018-05-21 16:32:32 -05:00
Jordan Brownandletterjay 9095d48215 Merge pull request #37955 from AutomaticFrenzy/patch/airlock-autoclose 
Keep only the most recent airlock autoclose timer
 2018-05-21 16:29:09 -05:00
LetterJayandGitHub 6489ef5511 Merge pull request #6550 from Citadel-Station-13/upstream-merge-37476 
[MIRROR] Uppercases slot defines.
 2018-05-21 11:23:02 -05:00
LetterJayandGitHub e57cf81636 Merge branch 'master' into upstream-merge-37582 2018-05-21 08:35:21 -05:00
LetterJayandGitHub 32cf8e6eb2 Merge pull request #6812 from Citadel-Station-13/upstream-merge-37928 
[MIRROR] Comms consoles don't update while viewing messages
 2018-05-21 08:30:19 -05:00
Nichandletterjay 177139a1d3 Replace nauseous with nauseated (#37927) 2018-05-21 03:06:39 -05:00
LetterJayandGitHub 0758204515 Merge branch 'master' into upstream-merge-37476 2018-05-20 23:12:07 -05:00
LetterJay ea9b3622fd Merge branch 'master' into upstream-merge-37476 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2018-05-20 23:11:16 -05:00
Jordan Brownandletterjay 2fb886065b Merge pull request #37928 from nichlas0010/fixescommsconsoleupdates 
Comms consoles don't update while viewing messages
 2018-05-20 19:38:01 -05:00
kevinz000andletterjay d54667c81b [READY]Refactors techwebs to have different types of points - PR HAS NO GAMEPLAY IMPACT 2018-05-19 18:51:51 -05:00
deathride58andGitHub 146f953966 Merge pull request #6694 from Citadel-Station-13/upstream-merge-37423 
[MIRROR] [s] Hallucinations 4.0
 2018-05-17 18:12:57 +00:00
ShizCalevandletterjay 0e819cb1fc Fixes container_resist runtimes (#37888) 2018-05-17 10:57:48 -05:00
LetterJayandGitHub 8efc7711a7 Merge branch 'master' into upstream-merge-37423 2018-05-16 12:17:57 -05:00