shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,534 Commits 5 Branches 0 Tags
237cc0dabdba074a5bbb2446dfd38483bfcf6d80
Commit Graph

563 Commits

Author SHA1 Message Date
Cw3040
fd1a93907f Box Fix 
Accidentally deleted a disposals pipe in Maint, this rectifies that.
 2018-06-08 20:21:10 -04:00
Cw3040
d5e3001261 Changes 
This should fix Travis's issue.
 2018-06-07 21:14:21 -04:00
Cw3040
45ec368d76 Pubby Changes 
-Added Cryogenics
-Kinkmates, of course.
-Keg in maint bar
 2018-06-07 20:53:15 -04:00
Cw3040
b833a88204 MetaStation Changes 
Added Cryosleepers and KinkMates
 2018-06-07 20:44:02 -04:00
Cw3040
fa2cbe7fdc BoxStation Changes 
-Maintbar
-Added Cryosleepers
-Added KinkMate in Locker Room
 2018-06-07 20:43:22 -04:00
81Denton
e3f9229e08 Fixes Pubby maint boozeomat (#38300) 2018-06-06 02:36:34 -05:00
LetterJay
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
LetterJay
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
LetterJay
391d4f1cfa Merge pull request #6996 from Citadel-Station-13/upstream-merge-38245 
[MIRROR] Readds missing objs to Delta toxins
 2018-06-03 16:20:30 -05:00
81Denton
8b4a3ab273 Readds missing objs to Delta toxins (#38245) 
* prb: no update

* another one
 2018-06-03 11:04:30 -05:00
81Denton
0d42b1c4d1 Replaces airlock_controller/incinerator related varedits with defines/subtypes 2018-06-03 11:03:14 -05:00
Jalleo
d3f34517dc Slight changes to camera network code 2018-06-03 09:04:24 -05:00
theo2003
b9ac5c0544 Roboticists now have access to open the R&D windoors. (#38226) 2018-06-03 09:03:42 -05:00
LetterJay
3b498f2288 map fix 2018-06-02 05:41:31 -05:00
Cruix
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
deathride58
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
CitadelStationBot
1ce820d2ed [MIRROR] Adds action features to the metastation beerkeg-nukes (#6925) 
* Adds action features to the metastation beerkeg-nukes (#38084)

* Hottomonkulu Pyynö mos kyren hepität. Nerse marentaat aluturnate.

* Masennoo sum keuron väkeltäät vassem Pyynö er borsalitaat Urmas.

* Tarnatat kuulor ustanitat vernes heuremasso seurutik Pyynör kanervo mahkatosimos. Atti ivakhan nutiv.

* Surmustulet nasnas kyhille nes viuhuntut sepelitör arnisansatin.

* Adds action features to the metastation beerkeg-nukes

* Test 1

* Test 2

* Test 3
 2018-05-27 19:32:09 -07:00
LetterJay
69af2087aa Merge pull request #6848 from Citadel-Station-13/upstream-merge-37631 
[MIRROR] Buffs atmospheric analyzers to show mole count, volume and higher degrees of precision
 2018-05-27 01:32:02 -05:00
oranges
e0c31c2b3a Merge pull request #37984 from AutomaticFrenzy/patch/thunderdome 
Fix entertainment monitors viewing the wrong Thunderdome
 2018-05-23 05:15:46 -05:00
cyclowns
f37865ee6c Buffs atmospheric analyzers to show mole count, volume and higher degrees of precision (#37631) 
add: Analyzers can now scan all kinds of atmospheric machinery - unary, binary, ternary, quaternary, you name it. This means stuff like gas pumps, gas mixers, vents and so forth can be analyzed.

tweak: Analyzers now show temperature in kelvin as well as celsius.

tweak: Analyzers now show total mole count, volume, and mole count of all gases.

tweak: Analyzers show everything at slightly higher degrees of precision.


More accurate and advanced analyzers have been something that I think atmos and toxins mains have been wanting for a while now (including myself). It's always a pain to have to manually add 273.15 to every celsius temperature, or have to use outside tools or VV (which isnt usable in actual games) to calculate mole count for a gas mixture. Not to mention, the ability to analyze things like volume pumps and gas filters makes it easier to manage larger atmos setups. This is just a QoL change for people in any of those jobs. In fact, most players probably don't even know what the fuck is a mole is so adding mole readout to analyzers is a good way to get people to understand atmospherics better.
 2018-05-22 22:11:23 -05:00
LetterJay
86f69e2947 Merge pull request #6796 from Citadel-Station-13/upstream-merge-37890 
[MIRROR] [Ready] Adds "proper" solar/gold/silver crates
 2018-05-19 09:13:58 -05:00
81Denton
5ed28b5cd2 Adds "proper" solar/gold/silver crates (#37890) 
* adds solar/gold/silver crates

* replaces pubbystation crates

* hhhh

* forgot adding spaces

* travis pls
 2018-05-19 02:14:00 -05:00
Mark9013100
21b9f72e49 Deltastation edits/fixes (#37876) 
Readds a missing solar panel to port-bow solars.
Replaces an access locked kitchen fridge in arrivals maintenance with its no-access variant.
Readds missing decal warning lines.
 2018-05-17 21:16:02 -05:00
deathride58
bb1fe6cba2 Merge pull request #6660 from GrayRachnid/add-dorms-to-ninja-capture 
Add dorms to ninja capture
 2018-05-15 20:53:05 +00:00
LetterJay
ce98f9c444 Merge pull request #6746 from Citadel-Station-13/upstream-merge-37785 
[MIRROR] Replaces loose tech storage boards with spawners
 2018-05-15 06:53:25 -05:00
LetterJay
f86af0ab41 Merge pull request #6743 from Citadel-Station-13/upstream-merge-37818 
[MIRROR] Fix some missing icons
 2018-05-15 06:52:32 -05:00
Jordan Brown
3b03fa3a37 Replaces loose tech storage boards with spawners 2018-05-14 15:18:17 -05:00
Jordan Brown
7dc1c116d5 Merge pull request #37818 from AutomaticFrenzy/patch/missing-icons 
Fix some missing icons
 2018-05-14 15:13:33 -05:00
Jordan Brown
5a76b56d04 Merge pull request #37743 from AutomaticFrenzy/patch/meta-pipe 
Remove a duplicate pipe in MetaStation maint
 2018-05-14 11:01:08 -05:00
81Denton
8463204549 Runtime: fixes RTG power, adjusts pipenet, adds debug chem dispensers 2018-05-12 18:53:59 -05:00
GrayRachnid
a7196f0d4c Unlocks the booze locker 2018-05-07 12:29:36 -04:00
GrayRachnid
e22259a77d mapmerger 2018-05-06 16:37:44 -04:00
GrayRachnid
41ce1b1e5b Now ready for all your ERP needs. 2018-05-06 16:20:49 -04:00
LetterJay
f387bb1694 Merge pull request #6633 from Citadel-Station-13/upstream-merge-37622 
[MIRROR] Changes cockroach guts to insect guts
 2018-05-05 09:40:11 -05:00
Jordan Brown
5fae4a6c90 Merge pull request #37649 from 81Denton/watch-me-mash-my-keyboard-fwgiupghebipuernbvepw9vb85344355v 
Fixes runtimestation RnD machinery, adds circ printer+analyzer
 2018-05-04 11:17:40 -05:00
Jordan Brown
deddd8debe Merge pull request #37622 from ShizCalev/cockarock 
Changes cockroach guts to insect guts
 2018-05-03 08:42:46 -05:00
pigeons
2702788dac Removes stock market 2018-05-02 17:48:55 -05:00
Jordan Brown
8dd48870c1 Merge pull request #37570 from BuffEngineering/WestSolars 
Fixes mapping issue on deltastation
 2018-04-30 21:20:34 -05:00
YakumoChen
8bb3a4ec75 Readds BZ Cannisters for Xenobiology (#37481) 
* update BoxStation.dmm

Adds BZ to Xeno

* Update DeltaStation2.dmm

adds BZ to Xeno

* Update MetaStation.dmm

Updates Meta's Xeno with BZ

* Update PubbyStation.dmm

Adds BZ to Pubby's Xeno
 2018-04-30 01:12:22 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
deathride58
2ee4d3e77d Merge pull request #6515 from Citadel-Station-13/upstream-merge-37326 
[MIRROR] Removes SCP_294
 2018-04-27 09:35:43 +00:00
Armhulen
17aa0acef8 Removes SCP_294 (#37326) 
* aaah sweet essence

* bye bye sprites

* goodbye machine code

* bye bye blacklist entry

* whoops

* scp gone from runtime

* bye bye ract

* bye bye space ruin folder

* bye bye area
 2018-04-25 10:05:57 -05:00
Poojawa
45b1869666 fixes some rushed mapping issues. 2018-04-23 20:47:11 -05:00
Poojawa
b1d64e221a core maps updated. Lavaland mining base now has cryo 2018-04-23 04:30:03 -05:00
Poojawa
0d5d992732 compile fixes + initial map port 2018-04-23 03:37:10 -05:00
81Denton
3bcfd0dfb6 Delta ORM position (#37325) 
* makes delta ORM accessible

* turf decal
 2018-04-22 19:21:04 -05:00
Jordan Brown
492a31d37c Merge pull request #37195 from 81Denton/remove-tinyfan-from-the-premises 
Removes tinyfans from omega/delta tcomms
 2018-04-15 09:57:25 -05:00
LetterJay
5d5dc5483e Merge pull request #6399 from Citadel-Station-13/upstream-merge-37158 
[MIRROR] Cleans up CENTCOM morgue/chapel/library doors
 2018-04-14 07:42:57 -05:00
ShizCalev
5dfd1f7d42 grunge airlock 2018-04-13 09:04:55 -05:00
Emmett Gaines
d139c8ebb3 Updates baseturf helpers to the new baseturf system (#37154) 2018-04-13 07:58:37 -05:00