shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,146 Commits 5 Branches 0 Tags
c1a985d15418ec00a460560d878ea076c2a21ed0
Commit Graph
280 Commits
Author SHA1 Message Date
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
SmArtKarandGitHub 170a38a3a7 Porting sutures and meshes from /TG/ (#12532) 
* Porting sutures and meshes from /TG/

* Recipes fix
 2020-06-16 16:22:56 -07:00
TrilbyspacecloneandGitHub f42994c79b Toxin tweaks! Just storage (#12363) 
* Toxin tweaks

* bepis readd

* paintings

* Update DeltaStation2.dmm

* Fixed
 2020-06-09 05:34:22 -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
jjpark-kbandGitHub 1e0f30a446 [Map Edits] Minimal Piping/Device Fixes (#12239) 
* map fixes

* reverting delta fix for PR conflict
 2020-05-13 20:56:56 +02:00
MrJWhitandGitHub 2a9746b34a Pubby atmos opening up (#12117) 
* First update, atmos control room

* finalization

* Final bugfixes

* final update
 2020-05-09 02:55:07 +02:00
MrJWhitandGitHub 5bdafb78c1 Minor updates to pubby for fixing (#12059) 
* updates to pubby

* Dear justin, double check something BEFORE publishing it
 2020-05-01 18:56:40 +02:00
MrJWhit 100d7cffd2 Also fix that one maint door to be a maint door 2020-04-23 19:20:43 -04:00
MrJWhit 037ea6e073 fixing up the engine 2020-04-23 18:26:39 -04:00
TrilbySpaceClone d98f536003 map fix + cube fix 2020-04-19 19:38:23 -04:00
UristMcAstronautandGitHub 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
Ghommie 7c1e5aa2c9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655 2020-04-09 15:46:19 +02:00
kevinz000andGitHub b8548f521b Merge pull request #11746 from Trilbyspaceclone/found_and_hidden 
Atomic PR 1 or 2 - Toilet Mapping!
 2020-04-09 02:11:43 -07:00
kevinz000GitHubGhom
 		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
TrilbySpaceClone 62509ab4a9 the mapping side 2020-04-04 10:16:43 -04:00
Ghommie 45d1917f0f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655 2020-04-02 16:07:13 +02:00
Ghommie 2bf6d888bd Ports "Obliterates item_color: new washing machine functionality edition" 2020-03-30 18:31:26 +02:00
KathrinBailey 52138696d0 PROTO KINETIC dream CRUSHER 
oh yeah give me all the shutters daddy
 2020-03-26 13:08:37 +00:00
kevinz000andGitHub ea7c1058b5 Merge pull request #11524 from Ghommie/Ghommie-cit627 
More or less ports "Clothing /under repath"
 2020-03-23 10:40:31 -07:00
XantholneandGitHub 80baf85300 Bumbles, the Humble Bumblebee finally finalized the contract to move into his new home in Hydroponics (#11543) 
* Maps Bumbles in for once

* Hopefully fixes merge conflicts?
 2020-03-22 13:13:40 +01:00
Detective-GoogleandGitHub 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
Detective Google 7889ea0d68 fix + maps 2020-02-20 22:58:43 -06:00
ShadeAware 5afbe44be3 Attempt Numero Dos! 
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 2020-02-11 17:27:40 -05:00
kevinz000andGitHub 3f5805a9e8 Merge pull request #10798 from necromanceranne/secmainsrejoice 
Formal security wear are now armor vests (HAS SOME BALANCE CONCERNS)
 2020-02-06 23:52:49 -07:00
necromanceranne 07a4515b23 Thankfully I didn't fuck it up this way 2020-02-03 15:03:16 +11:00
Tupinambis ffa7590203 Status Displays should now actually work 2020-01-30 16:07:26 -06:00
r4d6 98bb9397ea fix cyborgs spawns 2020-01-16 21:05:51 -05:00
BlackMajor 30fc5b560b Couple of lingering fixes 2020-01-11 17:57:18 +13:00
BlackMajor b41c9cd844 Sync with master 2020-01-08 12:25:22 +13:00
TrilbySpaceClone ec0596c404 Update 2019-12-23 18:52:33 -05:00
kevinz000andGitHub 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
LinandGitHub f38747ed70 Merge pull request #10207 from Ghommie/Ghommie-cit468 
Fixes pubby wall meds being var-edited snowflakes.
 2019-12-19 23:41:36 +00: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 f738e370a4 Fixes pubby wall meds being var-edited snowflakes. 2019-12-16 15:22:50 +01:00
Ghommie 4502d7b795 Ports improved and simplier fire alarms. 2019-12-12 22:44:20 +01:00
FermiandFermi 18e1246fd0 Classic fixes 2019-11-21 03:16:18 +00:00
FermiandFermi ff7b070fa1 Maps 2019-11-21 02:16:15 +00:00
Persi 1f2a32b94d Adds two VR sleepers to all current maps' perma. 2019-11-13 00:49:50 -05:00
Ghommie f6feeb93ea Mapping in arcade dirs. 2019-10-30 16:47:44 +01:00
deathride58andGitHub f85f110baa Merge pull request #9047 from Poojawa/syntheticbloods 
RGB Blood Reworks + Blood generator
 2019-10-23 20:54:55 -04:00
BlackMajor 959c4b35ce Update all them shuttles 2019-10-21 22:00:18 +13:00
Poojawa 184e81eec0 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-16 01:51:51 -05:00
kevinz000andGitHub 7187da9e72 Merge pull request #9456 from Thalpy/Spookytime 
[READY] [Spookytime] Adds Jacqueline the Pumpqueen
 2019-10-15 23:11:35 -07:00
Ghommie 22fc7a9088 Resprites bedsheet bins in 3/4 perspective, adds towel bins subtype. 2019-10-14 02:32:23 +02:00