shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,942 Commits 5 Branches 0 Tags
558a989d8a957504ea3fe0e1a5b3f21ba34e8597
Commit Graph

34 Commits

Author SHA1 Message Date
Poojawa
fa70720cc1 Map Conversions 2018-09-11 08:58:34 -05: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
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -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
5fa001c10f things with stuff (#6233) 
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
 2018-04-07 23:07:09 -04:00
Michiyamenotehifunana
8e620324a8 maps particle blasters 2018-03-27 23:05:16 +08:00
Poojawa
74eddfd888 Fixes broken engineering in Pubby 2018-03-15 20:45:50 -05:00
Poojawa
6c7da493d9 Reee mirror bot. Hard syncs some missed PR stuff + maps (#5951) 
* maps and tgui

* missed defines and helpsers

* controller things

* datums

* game folder stuff

* module things

* icons

* stragglers

* map sync and updating

wew lad
 2018-03-14 16:49:40 -05:00
deathride58
7b9dac0a47 Makes the titlescreen properly positioned for widescreen again (#5874) 
* Makes the titlescreen properly positioned for widescreen again

* Appeases Pooj, requests knot
 2018-03-13 18:38:49 -05:00
Poojawa
bbdf396d28 Pissy babies have their consoles back. 
Not like they play science anyway.
 2018-03-07 00:12:43 -06:00
Poojawa
86b11050b6 Citadel's folder's end (#5828) 
* ERP, miscreants, clothing

* github pls

* guns, dogborg, areas, vendor

* finishes moving around the last of the stuffs

* cleaned up shit. italics on subtle messages

vore code to modular_citadel too

* updates codeowners and recompiles tgui

because it's a healthy thing to do

* reee, I had that spawner set byond

* cleans up a bad pipe

does the thing I've been meaning to do for a while now as well.

* bumps up xenobio console requirements

inb4 reee

* snowflake commenting
 2018-03-06 17:40:48 -06:00
CitadelStationBot
9a2ea0eb69 [MIRROR] Pubbystation: tweaks and fixes round two (#5803) 
* Pubbystation: tweaks and fixes round two

* pubby fixes
 2018-03-06 07:08:16 -06:00
Poojawa
0afe9eb7c3 All Maps now have Tesla as a primary engine (#5787) 
* Converts all stations except Omega to Tesla Engines

* tweaks and meta fixes

* removes an exploit

* add some missing lights
 2018-03-06 03:59:11 -06:00
CitadelStationBot
674179361a [MIRROR] Pubbystation: Firelocks, shutters, fixes (#5764) 
* Pubbystation: Firelocks, shutters, fixes

* Pubby fixes, again.
 2018-03-03 21:46:52 -06:00
CitadelStationBot
16dc017835 [MIRROR] Pubby fixes (#5683) 
* Pubby fixes

* fixes pubby mabye

* actually fixes Pubby. Also fixes missing wire near cryo
 2018-03-02 20:08:55 -06:00
Poojawa
7d488e8f4c Citadel'd Maps from #5523 (#5551) 
* #5523 commit + sanity upload

* reee

* Syncs home brew CItadel changes

* updates cit_map_files

* reee.
 2018-02-17 18:04:28 -06:00
Poojawa
bd79a988bb backs up citadel edited maps 2018-02-17 14:44:31 -06:00
deathride58
09436512b4 Merge branch 'master' into TG-sync-testing 2018-02-03 01:52:44 +00:00
Zna12
5e06583dad What a mess. (#5238) 
This should fix the issue of having the minerals and output coming out of the wrong sides of the ORM.
 2018-02-01 06:20:43 -08:00
Poojawa
ab0e0667f2 Makes Travis happy 2018-01-31 18:11:19 -06:00
Zna12
1a337792e6 Whoops. 
Used the wrong flooring under the windows I added.
 2018-01-28 22:39:27 -06:00
Zna12
a4cdb47aa7 Pubby Station ORM Security 2018-01-28 21:09:15 -06:00
Zna12
3c70a621d4 Omega Station ORM Security 
Added a windoor with Mineral Storage access to Omega's ORM
 2018-01-28 21:07:52 -06:00
Zna12
e457b1ddc5 Meta Station ORM Security 
Added a windoor to Meta Station's ORM
 2018-01-28 21:05:50 -06:00
Zna12
906412690d Delta Station ORM Movement 
Delta Station ORM Moved to more publicly accessable area.
 2018-01-28 21:03:32 -06:00
Zna12
27204a32c8 Box Station ORM and Protolathe Movements 
Moved the ORM and Protolathe in cargo around to help lower the ammount of break ins that happen.
 2018-01-28 20:56:06 -06:00
Zna12
51b8d8706a Revert "ORM Security." 
This reverts commit f6af76ab4e.
 2018-01-28 20:18:41 -06:00
Zna12
f6af76ab4e ORM Security. 
Ore Redemption Machines have been moved to more publicly accessable areas on Box and Delta stations. All stations now have a Mineral Storage locked windoor in front of the ORM. Also moved the Cargo Protolathe into the mining dock because Miners kept breaking into the cargo bay to grab shit on high pop rounds.
 2018-01-28 18:54:52 -06:00
LetterJay
13c3c7b4e7 Merge pull request #5038 from Citadel-Station-13/upstream-merge-34466 
[MIRROR] Fake nuclear disks are even more convincing
 2018-01-25 13:41:02 -06:00
LetterJay
069972b3a0 map 2018-01-25 12:59:30 -06:00
LetterJay
41adb46c2a fixes travis 2018-01-24 21:51:02 -06:00
deathride58
9e0f8384e5 ATTEMPT NUMBER 2 AT SEPARATING MODIFIED MAPS FROM TG MAPS 2018-01-17 23:51:54 -05:00