shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,180 Commits 5 Branches 0 Tags
d78cdb9b3780ff58cbe4fefb44f75964e1d2e206
Commit Graph
1310 Commits
Author SHA1 Message Date
GhomandGitHub d78cdb9b37 Merge pull request #11130 from BlackMajor/SpaceRuins 
Enables space ruin generation in the station z-level. Adds new ruins for the sake of station ruins.
 2020-03-04 23:46:10 +01:00
BlackMajor 43e77f7d3a Last few fixes. Adds arcane wand to dead wizard roid. 2020-03-04 19:12:56 +13:00
YakumoChenandGitHub 1e34e3d081 Add files via upload 2020-03-01 05:19:27 -05:00
YakumoChenandGitHub cc2e0a6440 makes mining base less ugly 2020-03-01 03:45:03 -05:00
BlackMajor fc4f9e7800 How about a few more roids. 2020-02-28 16:07:57 +13:00
BlackMajor c326ca28a2 Adds the ruin spawn to KiloStation as well. 2020-02-26 23:57:53 +13:00
BlackMajor be740ba690 Merge branch 'master' into SpaceRuins 2020-02-26 20:58:46 +13:00
GhomandGitHub 5ee2f0dcd8 Merge pull request #11169 from PersianXerxes/ohHeyKilo 
Ports Kilo Station from Skyrat
 2020-02-25 14:48:37 +01:00
GhomandGitHub ea5774e713 Merge pull request #11225 from r4d6/Random-Mining 
Make the mining base's placement random
 2020-02-25 14:41:40 +01:00
GhomandGitHub 5adfb5ca46 Merge pull request #11212 from r4d6/engine 
Fix AM engine map
 2020-02-25 14:23:56 +01:00
Persi f48fd43e82 Fixed dining room sofas, oops 2020-02-25 00:29:19 -05:00
BlackMajor f2fe25d118 Updates maps with ruin border. Lowers ore gen on roids. 2020-02-25 17:33:18 +13:00
BlackMajor fc85f62546 Merge branch 'master' into SpaceRuins 2020-02-25 16:51:39 +13:00
r4d6 f76a1c15f3 Port random mining base 2020-02-24 13:27:54 -05:00
BlackMajor 6624155e3d Hey you know this is probably a smarter way to go about ruin spawning in station space. 2020-02-25 02:21:28 +13:00
kevinz000andGitHub 8cf41997f5 Merge pull request #11201 from Hatterhat/bows 
really just a lot of shit about bows
 2020-02-24 02:33:54 -07:00
kevinz000andGitHub 43c17b4ab3 Merge pull request #11180 from Detective-Google/psych+paramedic 
Adds epic and also cool paramedics [lazy tg port]
 2020-02-24 02:30:36 -07:00
BlackMajor ca6341aac4 Merge branch 'master' into SpaceRuins 2020-02-24 19:47:52 +13:00
r4d6 12ea22fdbf Fix 2020-02-23 14:52:12 -05:00
Persi 4af2eee9dd Haha, okay... this will break Kilo 
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ohHeyKilo
 2020-02-23 02:28:18 -05:00
GhomandGitHub 211be93718 Merge pull request #11182 from Trilbyspaceclone/doner_begone! 
Removes doner items as well as armored hats from holodeck lockers
 2020-02-22 22:30:34 +01:00
Hatterhat 2d29b37ce9 slab spawns and grammar shidd 2020-02-22 15:14:09 -06:00
Ghommie 8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01:00
TrilbySpaceClone 257cc813e2 Armorless 2020-02-21 01:10:34 -05:00
Detective Google 7889ea0d68 fix + maps 2020-02-20 22:58:43 -06:00
GhomandGitHub 91cbc8fb3c Merge pull request #11163 from MrJWhit/update-to-teg-design 
Quick TEG update
 2020-02-21 02:43:30 +01:00
GhomandGitHub e92183e968 Merge pull request #10541 from Detective-Google/the-p-o-o-l 
adds the POOL to box station
 2020-02-21 02:43:04 +01: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 cf0b1bbac6 Replace ablative bat with spear. Give ruins a max distance from the transit edge, to dissuade spawning too close to the station. 2020-02-21 00:22:50 +13:00
Persi c4b4a90bd8 Oh hey it's KiloStation 
Trying to make Kilo open...

Finally, the work begins!

Kilo added!

Kilo Station!
 2020-02-20 00:58:54 -05:00
MrJWhit c498b1df95 Quick TEG update 
asdf
 2020-02-19 22:00:15 -05:00
kevinz000andGitHub aeb8087441 Merge pull request #10904 from Hatterhat/golem-ship-gps 
granting golems GPSes that are off by default
 2020-02-19 19:00:24 -07:00
BlackMajor 9a54b451eb Added two more ruins, Owai's suggestions. 2020-02-18 12:57:48 +13:00
BlackMajor aff71e7f14 Initial Commit. Adds space ruins to station z. 2020-02-17 23:44:06 +13:00
Hatterhat aedd8b87f6 maybe giving them an active gps is a bad idea 2020-02-16 02:33:14 -06:00
kevinz000andGitHub 14fdd90618 Nerfs public autolathes (#10970) 2020-02-16 07:37:24 +01:00
kevinz000andGitHub eb33901046 Merge pull request #11002 from BlackMajor/walkerbois 
Makes the Ash Walker camp a static spawn in lavaland.
 2020-02-15 11:47:58 -07:00
GhomandGitHub b3a530abc9 Merge pull request #11027 from ShadeAware/capsdrobe2 
Captain's Locker De-bloat, plus the Captain's Wardrobe (NOW WITH NO MERGE CONFLICTS)!
 2020-02-13 09:40:22 +01:00
GhomandGitHub ce5208a1df Merge pull request #11007 from r4d6/random-fixes 
Mining Shuttle Fix
 2020-02-12 10:10:16 +01:00
ShadeAware 5afbe44be3 Attempt Numero Dos! 
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 2020-02-11 17:27:40 -05:00
GhomandGitHub 5726f041a8 Merge pull request #10996 from PersianXerxes/gulagChanges 
Separates gulag and public mining, removes sec vendor from gulag
 2020-02-11 09:34:04 +01:00
BlackMajor dc4790bdd4 Move RCD to spawn room on suggestion 2020-02-11 16:44:39 +13:00
r4d6 dccbb49626 Fixes 2020-02-10 11:59:14 -05:00
BlackMajor 4dddca9c7a forgot that 2020-02-10 21:50:20 +13:00
BlackMajor d778273083 Make ash walkers a static spawn 2020-02-10 21:46:03 +13:00
GhomandGitHub 0d37700836 Merge pull request #10926 from keronshb/PirateBombProof 
Buffs the Pirate Ship to be bomb resistant
 2020-02-10 08:40:10 +01:00
Persi 4c2359de3b Separates gulag and public mining, removes sec vendor from gulag 2020-02-09 21:45:57 -05:00
keronshb 60a3b134a3 Should fix the rest of the requested changes 
Title
 2020-02-09 17:30:22 -05:00
keronshb 9609eb64e0 Fixes some files and pathings for this 
Adds proper subtypes, put the health down a lil bit for the turret, fixed the welder type, added some tiny fans to the ship and also added some plastitanium windows where r-windows were
 2020-02-09 15:18:15 -05:00
Detective Google 8643b0103e fucking MAGIC FLOATING LIGHTS AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA 2020-02-08 01:23:08 -06:00