shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,276 Commits 5 Branches 0 Tags
c947dfdca5b1fd0cef47cd3facbbdcd71ebcbf41
Commit Graph

197 Commits

Author SHA1 Message Date
MrJWhit
c34656c5e8 The rest of the stuff 2020-12-15 13:51:04 -05:00
Ghommie
f49f72338f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit841 2020-10-25 15:01:57 +01:00
Ghommie
90c4cb2022 Here I fix a few issues. 2020-10-25 14:50:42 +01:00
MrJWhit
c860cc78df Giving science a space loop on every map (#13611) 
* Boxstation Fix

* DeltaStation and Boxstation Update

* Kilo fix and minor omegastation fix

* Lambda fixing

* Metastation update

* Second to last update

* Pubby and final touches
 2020-10-25 14:15:01 +01:00
Detective Google
c4480afc09 Adds a bunch of RP clothes and ports the detvendor 2020-09-30 20:50:00 -05:00
Artur
435565f1d8 Merge remote-tracking branch 'origin/master' into TGUI_Updoot 2020-09-21 00:16:12 +03:00
EmeraldSundisk
79f246c5ae Add files via upload 2020-09-05 17:35:26 -07:00
EmeraldSundisk
218d8a0504 Update OmegaStation.dmm 2020-09-05 16:31:07 -07:00
EmeraldSundisk
7b8a8232a6 Update OmegaStation.dmm 2020-09-02 19:26:23 -07:00
Artur
2f6791d004 Why are pixel_y = 0 and pixel_x = 0 motherfucking appearing 2020-09-02 22:07:30 +03:00
MrJWhit
4700aa5c16 OmegaStation Update 2020-08-20 01:25:31 -04:00
Michiyamenotehifunana
b33fc8e3b3 Adds Opposums to all maps 
Except cogstation because it throws an error
 2020-08-09 16:47:17 +08:00
silicons
3c5aa67eef Merge pull request #12867 from EmeraldSundisk/omega717 
Expands OmegaStation's medical wing.
 2020-07-23 10:29:29 -07:00
EmeraldSundisk
29023f9522 Add files via upload 2020-07-22 16:49:40 -07:00
EmeraldSundisk
f422ffb998 Update OmegaStation.dmm 2020-07-22 15:24:20 -07:00
EmeraldSundisk
bcec131eff Update OmegaStation.dmm 2020-07-20 22:06:00 -07:00
silicons
267186a5d3 Merge pull request #12646 from Chiirno/emi 
[READY] Alt-click cigarette pack functionality added to pill bottles.
 2020-07-20 16:15:38 -07:00
EmeraldSundisk
166ad02d6b Update OmegaStation.dmm 2020-07-19 22:26:35 -07:00
EmeraldSundisk
f9222485bf Update OmegaStation.dmm 2020-07-18 22:56:27 -07:00
Cirno
bd289d0edb more map changes... 2020-07-05 00:08:33 -03:00
Artur
b1a45b2b0d what the fuck ma-[ps 2020-07-04 16:34:29 +03:00
Artur
6ee1eba56c Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-02 23:23:47 +03:00
Ghom
8666f83848 Merge pull request #12620 from EmeraldSundisk/omegasec2 
Gives Omega Station genpop.
 2020-07-01 19:52:44 +02:00
EmeraldSundisk
2926f8dab1 Add files via upload 2020-06-26 16:40:01 -07:00
EmeraldSundisk
37f2242eec Update OmegaStation.dmm 2020-06-26 15:08:21 -07:00
EmeraldSundisk
71576d79ee Update OmegaStation.dmm 2020-06-24 15:01:58 -07:00
Ghommie
de77b7139c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-23 00:13:14 +02:00
Artur
aff4e5f93f Linter fixes 2020-06-22 17:58:52 +03:00
EmeraldSundisk
7f6e8f8670 Update OmegaStation.dmm 2020-06-21 00:30:30 -07:00
Artur
bc30fb7710 Hard resets _maps to master 2020-06-16 16:09:05 +03:00
Artur
ae7aea43b2 Annoying map shjit 2020-06-16 01:37:25 +03:00
EmeraldSundisk
6512866c06 Initial OmegaStation Security overhaul. (#12499) 
* Update OmegaStation.dmm

* Update OmegaStation.dmm

* Update OmegaStation.dmm

* Add files via upload
 2020-06-11 05:44:01 -07:00
EmeraldSundisk
1d990d317e Minimally invasive update to Omega Station. (#12434) 
* Update OmegaStation.dmm

* Update OmegaStation.dmm

* Add files via upload
 2020-06-04 15:44:12 -07:00
Ghommie
30ab79e09e Porting the twohanded component. 2020-05-17 18:16:53 +02:00
Ghommie
fc5d5fb087 Moving buttons away from windows. 2020-05-14 00:23:47 +02:00
UristMcAstronaut
c7b174676b Add files via upload 2020-04-14 16:15:31 +00:00
kappa-sama
94bcc6a64b removes these 2020-04-13 14:38:30 -04:00
kevinz000
8b2132317b Ports a rewritten version of BAYSTRUMENTS (#11680) 
* bay instruments

* k

* AAA

* remove that

* changes

* Update _instrument_key.dm

* safety nets

* @ghommie fixed

* volume

* Update item.dm

* Update item.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-04-07 15:21:50 +02:00
KathrinBailey
52138696d0 PROTO KINETIC dream CRUSHER 
oh yeah give me all the shutters daddy
 2020-03-26 13:08:37 +00:00
kevinz000
ea7c1058b5 Merge pull request #11524 from Ghommie/Ghommie-cit627 
More or less ports "Clothing /under repath"
 2020-03-23 10:40:31 -07:00
Detective-Google
043de9dcd2 Removes the roundstart syringe guns on each map, replacing them with medidart guns. (#11560) 
* nukes roundstart syringe guns for roundstart dart guns.

* fixes the delta and meta maint syringes to have an identical change.

* brings lambda up to date with master.
 2020-03-22 13:11:37 +01:00
Ghommie
86898cc451 Force pushed updates 2020-03-22 01:43:19 +01:00
BlackMajor
f2fe25d118 Updates maps with ruin border. Lowers ore gen on roids. 2020-02-25 17:33:18 +13:00
TrilbySpaceClone
ec0596c404 Update 2019-12-23 18:52:33 -05:00
kevinz000
85ceda474e Merge pull request #10218 from GrayRachnid/ADDS-MINERS 
Adds gas miners to all maps.
 2019-12-23 00:45:22 -08:00
TrilbySpaceClone
d3a8025675 Wew 2019-12-22 02:17:24 -05:00
Ghommie
3cb8391f38 Hopefully this won't screw up travis. 2019-12-17 12:15:28 +01:00
GrayRachnid
774d853607 Adds gas miners to all maps. 2019-12-17 01:39:25 -05:00
Ghommie
4502d7b795 Ports improved and simplier fire alarms. 2019-12-12 22:44:20 +01:00
Fermi
18e1246fd0 Classic fixes 2019-11-21 03:16:18 +00:00