8cf41997f5
Merge pull request #11201 from Hatterhat/bows
...
really just a lot of shit about bows
2020-02-24 02:33:54 -07:00
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
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
2d29b37ce9
slab spawns and grammar shidd
2020-02-22 15:14:09 -06:00
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
257cc813e2
Armorless
2020-02-21 01:10:34 -05:00
7889ea0d68
fix + maps
2020-02-20 22:58:43 -06:00
91cbc8fb3c
Merge pull request #11163 from MrJWhit/update-to-teg-design
...
Quick TEG update
2020-02-21 02:43:30 +01:00
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
c498b1df95
Quick TEG update
...
asdf
2020-02-19 22:00:15 -05:00
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
aedd8b87f6
maybe giving them an active gps is a bad idea
2020-02-16 02:33:14 -06:00
14fdd90618
Nerfs public autolathes ( #10970 )
2020-02-16 07:37:24 +01:00
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
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
ce5208a1df
Merge pull request #11007 from r4d6/random-fixes
...
Mining Shuttle Fix
2020-02-12 10:10:16 +01:00
5afbe44be3
Attempt Numero Dos!
...
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
2020-02-11 17:27:40 -05:00
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
dc4790bdd4
Move RCD to spawn room on suggestion
2020-02-11 16:44:39 +13:00
dccbb49626
Fixes
2020-02-10 11:59:14 -05:00
4dddca9c7a
forgot that
2020-02-10 21:50:20 +13:00
d778273083
Make ash walkers a static spawn
2020-02-10 21:46:03 +13:00
0d37700836
Merge pull request #10926 from keronshb/PirateBombProof
...
Buffs the Pirate Ship to be bomb resistant
2020-02-10 08:40:10 +01:00
4c2359de3b
Separates gulag and public mining, removes sec vendor from gulag
2020-02-09 21:45:57 -05:00
60a3b134a3
Should fix the rest of the requested changes
...
Title
2020-02-09 17:30:22 -05:00
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
8643b0103e
fucking MAGIC FLOATING LIGHTS AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
2020-02-08 01:23:08 -06:00
c434382d6d
fixes map conflicts on this pr for the (3rd? 4th? I've lost count.) time.
2020-02-08 01:20:50 -06:00
278a9cf9ae
Merge pull request #10966 from r4d6/mininge
...
Fix mining base having holes to space
2020-02-08 05:06:22 +01:00
f4c148d44f
Fix mining base having holes to space
2020-02-07 22:58:47 -05:00
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
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
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
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
c4e7f2f8cd
Merge pull request #10898 from EmeraldSundisk/smalltime
...
Disposing of a problem on Delta.
2020-02-05 20:47:54 +01:00
20a5f905bc
Merge pull request #10832 from r4d6/shitters
...
Mining Update : Real update
2020-02-05 07:20:02 +01:00
aaa58ef1e8
Update Mining_Station_Public_01.dmm
2020-02-05 05:13:36 +01:00
7ef8b36324
golems have gpses now
2020-02-04 18:45:31 -06:00
f42ef66846
Move the lockers and the beacon
2020-02-04 19:25:10 -05:00
60163330f7
closets
2020-02-04 19:07:01 -05:00
32f3eec050
Real
2020-02-04 19:03:45 -05:00
205c38a7c5
edits 4-5 things, gets 40000 lines of code edits
2020-02-04 17:40:25 -05:00
8c25277913
Add files via upload
2020-02-04 12:17:28 -08:00
ab1730ad1f
Add files via upload
2020-02-04 11:38:36 -08:00
a726f09201
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-04 03:54:52 +01:00
0779b67acc
whoops
2020-02-03 15:51:07 +11:00
07a4515b23
Thankfully I didn't fuck it up this way
2020-02-03 15:03:16 +11:00
3fc832fbe7
Merge pull request #10819 from Ghommie/Ghommie-cit541
...
clown ops infiltrator consistency.
2020-02-02 01:39:08 -07:00
2bb0a0311a
Merge pull request #10796 from Tupinambis/StatusBugFix
...
Status Display Fix: It's About Time
2020-02-02 01:51:07 +01:00
55fa48737e
Forgot about not versioned files.
2020-02-02 01:28:16 +01:00
kevinz000