shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,729 Commits 5 Branches 0 Tags
7efceb213e033ce92b1cc6db59fd5845eb31cfc6
Commit Graph

518 Commits

Author SHA1 Message Date
CitadelStationBot
e1823e1a40 [MIRROR] You can now non-violently place people on tables (#5891) 
* You can now non-violently place people on tables (#36150)

* You can now non-violently place people on tables
 2018-03-10 07:43:14 -06:00
CitadelStationBot
a999863e5c [MIRROR] Fixes mirror var desync (#5883) 
* Fixes mirror var desync (#36251)

* Fixes mirror var desync
 2018-03-10 07:17:52 -06:00
deathride58
2c34acc034 Merge pull request #5853 from Citadel-Station-13/upstream-merge-35475 
[MIRROR] [reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments]
 2018-03-09 20:36:58 +00:00
deathride58
a62aa577f1 Merge pull request #5854 from Citadel-Station-13/upstream-merge-36055 
[MIRROR] Techwebs update: Protolathe/Circuit imprinters combined into techfabs!
 2018-03-09 19:25:12 +00:00
deathride58
936c6a33f2 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-35475 2018-03-09 14:18:47 -05:00
deathride58
1387c8e3b6 Merge pull request #5855 from Citadel-Station-13/upstream-merge-35858 
[MIRROR] Mushroom people, revived!
 2018-03-09 18:37:29 +00:00
deathride58
78db80026d Merge pull request #5840 from Poojawa/reverts-crybaby-inducer 
Reverts crybaby inducer also does the sync things
 2018-03-09 18:36:42 +00:00
Dax Dupont
27ff0a4f28 Display cases can now have a list where to randomly spawn items from (#36058) 
* Adds allowing display cases to pick from a random list

Keeps compatibility with older maps and moves trophy/plaque message to all display cases

* A bit more legible

* Refactors statues tool interaction code

* Don't override it already exists

* done
 2018-03-09 02:17:36 -06:00
Armhulen
e559fdca2c Mushroom people, revived! 2018-03-07 21:47:42 -06:00
kevinz000
91ac70a73e RND TECHWEBS: TECHFABS (#36055) 
Doing my little update piece by piece because I'm lazy and because storage PR is going to conflict everything ever.

Techfabs do not link to RND consoles, and have their own interface for producing things.
RND production machinery code refactored.
Techwebs have categories views instead of just a goddamn design list.
Old machinery will be kept in, as some places will keep them. Read: Engineering, robotics, etc.

experimental: Protolathes and circuit imprinters combined/changed to techfabs. All departments can now print related circuit boards. Engineering and science will keep their lathe/imprinter design by default at roundstart because they have specialized labs for those.
 2018-03-07 21:11:56 -06:00
Qustinnus
a96a28f3d6 [reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments] 2018-03-07 20:49:25 -06:00
Poojawa
95cb6b23f2 controllers, datums, game 2018-03-06 21:16:46 -06:00
CitadelStationBot
766b85908e [MIRROR] Adds the Ancient Cloning Lab ruin (#5814) 
* Adds the Ancient Cloning Lab ruin

* fixes conflicts
 2018-03-05 15:20:49 -06:00
CitadelStationBot
de97c9653a [MIRROR] SOMETHING'S WRONG, I HOLD MY HEAD, BILLY HERRINGTON IS FUCKING DEAD (#5792) 
* SOMETHING'S WRONG, I HOLD MY HEAD, BILLY HERRINGTON IS FUCKING DEAD

* Update fitness.dm

* fixes compile issue
 2018-03-05 12:37:40 -06:00
Tad Hardesty
8fe572acde Merge pull request #36054 from AutomaticFrenzy/patch/fancy-tables-2 
Fix placement of fancy tables in the editor
 2018-03-03 00:31:27 -06:00
LetterJay
863585f477 Merge pull request #5753 from Citadel-Station-13/upstream-merge-35440 
[MIRROR] Adds minor roundstart traits! (ala CDDA, etc.)
 2018-03-02 23:37:41 -06:00
CitadelStationBot
75b038511c [MIRROR] Alternative PR to brass apples: Adds bronze sheets (#5758) 
* Alternative PR to brass apples: Adds bronze sheets (#35874)

* Adds bronze sheets

* nope!

* Alternative PR to brass apples: Adds bronze sheets
 2018-03-02 20:07:39 -06:00
Ashe Higgs
0a449af83e Adds minor roundstart traits! (ala CDDA, etc.) 2018-03-02 14:38:18 -06:00
CitadelStationBot
78708a3582 [MIRROR] Fix icon of black fancy table in editor (#5735) 
* Fix icon of black fancy table in editor

* Fix icon of black fancy table in editor
 2018-02-28 19:41:44 -06:00
CitadelStationBot
749f8c4e5c [MIRROR] Revert "Mekhi goes on the table" (#5715) 
* Merge pull request #35980 from kevinz000/revert-35661-patch-483

Revert "Mekhi goes on the table"

* Revert "Mekhi goes on the table"
 2018-02-26 02:38:53 -08:00
CitadelStationBot
567c7fad8d [MIRROR] Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold (#5674) 
* Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold (#35796)

* - Stop subtracting from bodytemp please
- Also fixes shivering

* - Jesus christ why did you make me do this

* - missed one

* Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold
 2018-02-23 17:42:57 -06:00
CitadelStationBot
80c2f30bd4 [MIRROR] Lets silicons disable morguetray alarms at a distance (#5669) 
* Lets silicons disable morguetray alarms at range (#35855)

* Lets silicons disable morguetray alarms at a distance
 2018-02-23 06:45:01 -06:00
CitadelStationBot
afa88c7b31 [MIRROR] Makes the morgue alt-click message clearer (#5665) 
* Update morgue.dm (#35883)

* Makes the morgue alt-click message clearer
 2018-02-22 23:42:43 -06:00
Buggy123
eaab8a687c tabling people on brass tables makes a clanging sound (#35876) 
* tabling people on brass tables makes a sound

* fixes syntax

* more syntax fixes
 2018-02-22 14:32:25 -06:00
CitadelStationBot
da690f3e07 [MIRROR] Adds five second cooldown to morgue tray beeps (#5652) 
* Adds five second cooldown to morgue tray beeps (#35818)

* Adds five second cooldown to morgue tray beeps
 2018-02-22 01:37:06 -06:00
CitadelStationBot
c10a4184ce [MIRROR] Makes it more apparent that >>>>>>>YOU CAN ALT CLICK TO DISABLE MORGUE TRAY BEEPING<<<<<< (#5642) 
* Makes the morgue beep disable step clearer

cl
tweak: Nanotrasen has begun a campaign to inform their employees that you can alt-click to disable morgue tray beeping.
/cl

If its annoying you literally just alt-click to disable it. There's basically no situation where you would be able to hear it without being able to turn it off, except maybe the one morgue tray in the brig if you don't have access to the windoor (but just fucking ask sec to disable it).

* Makes it more apparent that >>>>>>>YOU CAN ALT CLICK TO DISABLE MORGUE TRAY BEEPING<<<<<<
 2018-02-21 19:44:58 -06:00
Ashe Higgs
08bc84d3db Adds the dish drive, obtainable through techwebs and with circuit boards in the chef and bartender's lockers (#35759) 
* Adds the dish drive

* a e s t h e t i c

* Puts a dish drive circuit in the chef locker

* wardrobes, better control

* shiz!

* shiz! (x2)
 2018-02-20 17:10:40 -06:00
Chayse Ramsay
0b42003f53 Merge branch 'master' into QM-as-Head 2018-02-18 03:46:35 +00:00
deathride58
d2e13833d6 Merge pull request #5496 from Citadel-Station-13/upstream-merge-35339 
[MIRROR] Support stations with multiple z-levels
 2018-02-17 21:24:48 +00:00
deathride58
305849fba4 Merge pull request #5550 from Citadel-Station-13/upstream-merge-35726 
[MIRROR] Reflectors now reset the range of a projectile like before!
 2018-02-17 20:44:06 +00:00
Dax Dupont
f31df38f83 Reflectors now reset the range of a projectile like before! (#35726) 
* Reflectors now reset the range of a projectile.

* how about dem apples
 2018-02-17 13:18:08 -06:00
Chayse Ramsay
377c116662 Merge branch 'master' into QM-as-Head 2018-02-16 13:09:58 +00:00
Jordan Brown
f9353da855 Quote the armor lists 2018-02-16 00:26:26 -06:00
oranges
5dc3549801 Merge pull request #35542 from ShizCalev/free-spam-removal 
Cleans up some duplicate canusetopic warnings
 2018-02-15 20:35:03 -06:00
deathride58
05ab5f7c0c Merge pull request #5510 from Citadel-Station-13/upstream-merge-35552 
[MIRROR] [s]Fixes writing bugs/exploits
 2018-02-16 01:32:23 +00:00
ShizCalev
98bbfb8709 [s]Fixes writing bugs/exploits 2018-02-15 16:10:03 -06:00
Tad Hardesty
5b30b29a4b Support stations with multiple z-levels (#35339) 
* Remove ZLEVEL_STATION_PRIMARY

* Add Up and Down traits for use by ladders and chasms

* Give map_config creation its own proc

* Combine LoadConfig and ValidateJSON and remove transition_config

* Make space linkage a z-level trait

* Remove ZLEVEL_EMPTY_SPACE

* Update uses of GetFullMapPath

* Handle multi-Z stations and load Lavaland and Reebe at runtime

* Remove unused space maps

* Fix inappropriate z-expansion in map reader, improve logging

* Update comments relating to z-level configuration

* Add Lavaland and Reebe to ALL_MAPS
 2018-02-15 10:39:08 -06:00
Jordan Brown
e95d3cd700 Merge pull request #35661 from MrStonedOne/patch-483 
Mekhi goes on the table
 2018-02-15 10:38:37 -06:00
CitadelStationBot
9b4770f855 [MIRROR] Mining tools now use tool system (#5462) 
* Mining tools now use tool system

* Update hydroponics.dm
 2018-02-14 05:36:15 -06:00
deathride58
72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05:00
Robustin
1825c944b6 Cult Update? Cult Update! (#35433) 
* Cult Fixes and Tweaks

* Master prompt and spelling fix

* Couple small fixes
 2018-02-12 15:18:21 -06:00
LetterJay
e4c49c3ce4 Merge pull request #5433 from Citadel-Station-13/upstream-merge-35566 
[MIRROR] Urinal cakes can now be picked up again
 2018-02-12 10:03:05 -06:00
LetterJay
15572d1d5f Merge pull request #5430 from Citadel-Station-13/upstream-merge-35514 
[MIRROR] Fixes wrong ID for syndicate ghost roles
 2018-02-12 10:01:42 -06:00
MoreRobustThanYou
0af6af731a Urinal cakes can now be picked up again (#35566) 
* Urinal cakes can now be picked up again

* Update watercloset.dm

* Update watercloset.dm

* Update watercloset.dm
 2018-02-12 09:01:28 -06:00
Chayse Ramsay
a1116f6dc8 QM is now a Head of Staff, everyone rejoice 2018-02-12 01:52:33 +00:00
Jordan Brown
e2b4e3c567 Fixes wrong ID for syndicate ghost roles 2018-02-11 15:35:14 -06:00
MoreRobustThanYou
6337c294d9 Makes urinal cakes more realistic (#35515) 
* Add files via upload

* Makes urinal cakes blue

* Add files via upload

* Delete urinalcake_squish.png
 2018-02-11 15:29:47 -06:00
CitadelStationBot
51d15518ae Merge pull request #5409 from Citadel-Station-13/upstream-merge-35456 
[MIRROR] [s] Fixes altclick exploits
 2018-02-11 09:43:09 -06:00
uraniummeltdown
e3ec8a648a Buildable Shuttle/Plastitanium Windows (#35376) 
* use titanium/plastitanium on unanchored reinforced fulltile window to make shuttle/plastitanium windows

* updates titanium/plastitanium sprites, adds titanium glass and plastitanium glass, fixes material amount in mineral glass
 2018-02-11 05:13:37 -06:00
ShizCalev
f4685cfe01 [s] Fixes altclick exploits 2018-02-11 05:08:00 -06:00