shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,712 Commits 5 Branches 0 Tags
4c10c830bf94de5f41e8c06bca0de5a856ad46f4
Commit Graph

1278 Commits

Author SHA1 Message Date
Ghom
91cbc8fb3c Merge pull request #11163 from MrJWhit/update-to-teg-design 
Quick TEG update
 2020-02-21 02:43:30 +01:00
Ghom
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
MrJWhit
c498b1df95 Quick TEG update 
asdf
 2020-02-19 22:00:15 -05:00
kevinz000
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
Hatterhat
aedd8b87f6 maybe giving them an active gps is a bad idea 2020-02-16 02:33:14 -06:00
kevinz000
14fdd90618 Nerfs public autolathes (#10970) 2020-02-16 07:37:24 +01:00
kevinz000
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
Ghom
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
Ghom
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
Ghom
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
Ghom
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
Detective Google
c434382d6d fixes map conflicts on this pr for the (3rd? 4th? I've lost count.) time. 2020-02-08 01:20:50 -06:00
Ghom
278a9cf9ae Merge pull request #10966 from r4d6/mininge 
Fix mining base having holes to space
 2020-02-08 05:06:22 +01:00
r4d6
f4c148d44f Fix mining base having holes to space 2020-02-07 22:58:47 -05:00
kevinz000
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
kevinz000
cf99ad9671 Merge pull request #10901 from Trilbyspaceclone/more-box-fixes-and-tweaks 
Corrects Box'es caps office + some other tweaks
 2020-02-06 03:47:28 -07:00
kevinz000
b17b98ff5f Merge pull request #10907 from Citadel-Station-13/Ghommie-patch-2 
Fixes no-grav lavaland labor/mining shuttle areas.
 2020-02-05 23:43:21 -07:00
keronshb
5d1d652ea4 Buffs the Pirate Ship to be bomb proof 
Title, also makes a few computers/machines indestructible and buffs turret health.  It also allows turrets to be repairable now.
 2020-02-05 18:28:00 -05:00
Ghom
c4e7f2f8cd Merge pull request #10898 from EmeraldSundisk/smalltime 
Disposing of a problem on Delta.
 2020-02-05 20:47:54 +01:00
Ghom
20a5f905bc Merge pull request #10832 from r4d6/shitters 
Mining Update : Real update
 2020-02-05 07:20:02 +01:00
Ghom
aaa58ef1e8 Update Mining_Station_Public_01.dmm 2020-02-05 05:13:36 +01:00
Hatterhat
7ef8b36324 golems have gpses now 2020-02-04 18:45:31 -06:00
r4d6
f42ef66846 Move the lockers and the beacon 2020-02-04 19:25:10 -05:00
r4d6
60163330f7 closets 2020-02-04 19:07:01 -05:00
r4d6
32f3eec050 Real 2020-02-04 19:03:45 -05:00
TrilbySpaceClone
205c38a7c5 edits 4-5 things, gets 40000 lines of code edits 2020-02-04 17:40:25 -05:00
EmeraldSundisk
8c25277913 Add files via upload 2020-02-04 12:17:28 -08:00
EmeraldSundisk
ab1730ad1f Add files via upload 2020-02-04 11:38:36 -08:00
necromanceranne
0779b67acc whoops 2020-02-03 15:51:07 +11:00
necromanceranne
07a4515b23 Thankfully I didn't fuck it up this way 2020-02-03 15:03:16 +11:00
kevinz000
3fc832fbe7 Merge pull request #10819 from Ghommie/Ghommie-cit541 
clown ops infiltrator consistency.
 2020-02-02 01:39:08 -07:00
Ghom
2bb0a0311a Merge pull request #10796 from Tupinambis/StatusBugFix 
Status Display Fix: It's About Time
 2020-02-02 01:51:07 +01:00
Ghom
d19b7a7695 Merge pull request #10744 from r4d6/Moar-Engines 
Moar engines!
 2020-02-01 19:11:10 +01:00
r4d6
f9ccca9c8f Anti-Shitter mining update 2020-02-01 00:08:01 -05:00
Ghom
37c4565160 Whops. Two beacons, not one. 2020-02-01 02:06:56 +01:00
Ghommie
ab4aa29576 clown ops infiltrator consistency. 2020-02-01 00:02:31 +01:00
Tupinambis
ffa7590203 Status Displays should now actually work 2020-01-30 16:07:26 -06:00
Ghom
f74475a6e0 Merge pull request #10749 from kevinz000/duke_moxley 
It's high noon...
 2020-01-30 00:19:37 +01:00
Lin
cde6601c60 Merge pull request #10759 from Ghommie/Ghommie-cit534 
demodularize and removes lot of unused clothing with missing sprites.
 2020-01-29 19:58:26 +00:00
Ghom
2643fd053b Merge pull request #10748 from Trilbyspaceclone/door- 
correct door to vault being all access
 2020-01-29 01:59:42 +01:00
kevinz000
9dfcef68ed Merge branch 'master' into duke_moxley 2020-01-28 17:53:08 -07:00