shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,734 Commits 5 Branches 0 Tags
bcf77458dd5639ba27f07dd4acb0a174aa562dbb
Commit Graph

186 Commits

Author SHA1 Message Date
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
Ghommie
86898cc451 Force pushed updates 2020-03-22 01:43:19 +01:00
Hatterhat
ab7fc2dc72 me and the boys stealing prs (#11517) 
Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
 2020-03-19 13:38:31 +01:00
BlackMajor
ca6341aac4 Merge branch 'master' into SpaceRuins 2020-02-24 19:47:52 +13:00
BlackMajor
984b57560b Fixes cults being able to summon at ruins. As well as stops the ash storm sound. 2020-02-21 01:39:16 +13:00
BlackMajor
aff71e7f14 Initial Commit. Adds space ruins to station z. 2020-02-17 23:44:06 +13:00
Ghommie
55fa48737e Forgot about not versioned files. 2020-02-02 01:28:16 +01:00
Ghommie
7837688426 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2019-12-28 23:41:10 +01:00
Ghommie
e0caf6007b Fixes space hermit asteroid rocks unintendedly spawning airless asteroid turf when mined, save for the perimeter... 2019-12-07 04:02:33 +01:00
Ghommie
9f00423bbd Fixing the deep space gorilla. 2019-10-29 21:51:00 +01:00
kevinz000
9096f03ad3 Merge pull request #8654 from Ghommie/Ghommie-cit54 
ports in the Hilbert's Hotel.
 2019-10-24 19:07:33 -07:00
kevinz000
969bc83179 Merge pull request #9586 from BlackMajor/Yeehaw 
Adds posibrains to the spawners menu for ghosts.
 2019-10-24 18:45:57 -07:00
BlackMajor
8b61fe3d72 posibrains on spawn list 2019-10-23 22:46:10 +13:00
Ghommie
f843a53fe9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-08-24 12:52:16 +02:00
Poojawa
96834bc517 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-20 03:36:17 -05:00
BlackMajor
1d22b77293 Merge pull request #8636 from Trilbyspaceclone/lighten_up 
Fixes missing air in Gas the Lizards in the freezer/surgery
 2019-08-19 20:02:26 +12:00
Poojawa
283b5d050e Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-08 16:51:53 -05:00
Ghommie
23e3263fcb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-08-08 04:46:54 +02:00
kevinz000
aea2f6f523 Merge pull request #8900 from Seris02/spaceruinsyee 
Abductor Replication Lab space ruin - take 2
 2019-08-05 00:55:40 -07:00
Poojawa
3499d73f6b Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods 2019-07-31 19:24:39 -05:00
Ghommie
72413c893f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-07-27 01:38:20 +02:00
Ghommie
589cdae0e1 Towels 2019-07-18 00:03:49 +02:00
Seris02
59f45d3e35 adds abductor replication lab with advanced tools 2019-07-15 15:18:04 +08:00
Ghommie
28d3747c5e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-06-24 16:55:10 +02:00
kevinz000
c9d67ecd49 Merge pull request #8667 from Ghommie/Ghommie-cit61 
Ports the system for randomized semi-persistent chem reactions.
 2019-06-23 06:54:43 -07:00
kevinz000
94d92f7b1b Merge pull request #8664 from BlackMajor/MeMapGood 
Adds another space ruin
 2019-06-23 06:49:37 -07:00
Ghommie
50dd512be7 Ports system for randomized semi-persistent chem reactions. 2019-06-17 10:50:40 +02:00
BlackMajor
1060bb05b4 Space hermit ruin 2019-06-17 17:41:46 +12:00
kevinz000
27333276de Merge pull request #8570 from Trilbyspaceclone/patch-170 
Ports origami skills for paper wiz loot
 2019-06-16 19:40:01 -07:00
kevinz000
d9119d43f0 Merge pull request #8627 from BlackMajor/MeMapGood 
Adds more space ruins.
 2019-06-16 19:29:23 -07:00
Ghommie
ba3a2c00bb ports in the Hilbert's Hotel. 2019-06-16 10:50:59 +02:00
BlackMajor
9219a2c813 Adding more ruins 2019-06-15 21:17:34 +12:00
BlackMajor
4528384976 Fuck it lets add way more spiciest PR 2019-06-15 19:03:04 +12:00
BlackMajor
9b01830987 Added fuel tank and welding goggles 2019-06-13 21:37:45 +12:00
TrilbySpaseClone
8be37e0494 Update gasthelizards.dmm 2019-06-12 18:50:52 -04:00
BlackMajor
0f8b6f72f8 Get the fuck out step_x/y 2019-06-12 15:08:20 +12:00
BlackMajor
b2c5430f6a Shit's done 2019-06-12 14:46:23 +12:00
BlackMajor
e2ad96f4c9 Made a shitty space ruin robotics lab 2019-06-12 01:21:16 +12:00
Trilbyspaceclone
c0d1ac5bd3 Update originalcontent.dmm 2019-06-07 18:42:23 -04:00
Poojawa
1f1f951924 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-06-03 05:35:52 -05:00
Sishen
d7fdaed181 Fixes the Oldstation Tile 2019-05-30 15:45:17 -04:00
Useroth
90b62234d6 Made the hotel booze-o-mat hacked by default. 2019-05-22 20:13:58 +02:00
Useroth
9441853f6d Boltable hotel. Now with mapmerge. 2019-05-22 19:28:50 +02:00
Poojawa
3f6cd92d54 Ok this time all of them are nitpicked 2019-05-09 10:15:51 -05:00
Poojawa
0f02562b51 Fixes Xenomorph blood related travis errors 2019-05-09 09:59:34 -05:00
Poojawa
e6597a192a Fixed duplicate turfs 2019-04-14 00:04:24 -05:00
Poojawa
29f4dfca83 Maps batch fixed 2019-04-13 23:30:22 -05:00
Trilbyspaceclone
b1205baa76 Update mrow_thats_right.dmm 2019-03-18 17:41:12 -04:00
deathride58
1c7fc9c699 Merge pull request #8067 from Trilbyspaceclone/patch-67 
Makes Dinner for two have loot
 2019-03-08 20:44:23 -05:00
Trilbyspaceclone
7edaff99de Update derelict2.dmm 2019-02-28 19:01:54 -05:00