Commit Graph

2033 Commits

Author SHA1 Message Date
BlueWildrose
72c377d72c Fixes pods not returning to Centcomm (#14609) 2021-04-14 15:10:04 +02:00
LetterN
e3fb2d5491 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-24 21:55:47 +08:00
LetterN
123dfd8eda map men map men map map map men men men 2021-03-24 21:31:06 +08:00
silicons
5910950a49 Merge pull request #14473 from ItzGabby/bark-box
Bark Box Remastered Edition
2021-03-22 21:15:14 -06:00
silicons
a1c4323653 Merge pull request #14457 from GrayRachnid/holopads
Fixes the bug that allows anybody(other than heads) to auto-call holopads and adds secure holopads.
2021-03-20 14:28:07 -06:00
LetterN
292f67e098 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-20 20:36:56 +08:00
silicons
013560c064 Merge pull request #14400 from LetterN/art-art-art
Map addition & cleanups
2021-03-20 01:08:47 -06:00
ItzGabby
7121295935 finalfix??? 2021-03-19 03:08:10 -04:00
GrayRachnid
b4969c4770 Fixes auto-calling for non-heads and adds secure holopads 2021-03-17 12:40:25 -04:00
DeltaFire
79a464ca8c Merge pull request #14141 from KeRSedChaplain/clockcultrework_v2
Clockwork cult rite additions and other edits
2021-03-16 07:39:41 +01:00
LetterN
2fe6125955 fixes this map 2021-03-15 22:16:49 +08:00
LetterN
27d9238f3a mapfix 2021-03-15 21:59:06 +08:00
LetterN
a478555dbd mapfix 2021-03-15 21:02:50 +08:00
silicons
2a6ccada97 Merge pull request #14402 from Hatterhat/limbgrowers
limb growers for pubby and delta
2021-03-12 19:35:56 -07:00
Letter N
935e46b492 The Mapping Update
Cleans up the map (again)
Makes mining code more better
2021-03-12 12:11:35 +08:00
Hatterhat
946096fd1d qm console announce 2021-03-10 22:35:33 -06:00
Hatterhat
2d157c51fa ok liberal 2021-03-10 09:09:50 -06:00
Letter N
69a054826b add art areas on meta, and adds lapvend on box,delta,meta.
Other map changes are cosmetic.
2021-03-10 16:34:37 +08:00
Letter N
754c24748e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-03 17:09:01 +08:00
silicons
8989394742 Merge pull request #14270 from LetterN/rustsql
Removes bsql 2
2021-03-03 00:53:46 -07:00
Vynzill
60011f339d Jungle Gateway Quickfix
haha, whoops! forgot I left a cursed rice hat in front of gate during my testing
2021-02-28 00:33:10 -06:00
Letter N
5c39381117 Merge remote-tracking branch 'origin/master' into rustsql 2021-02-23 11:36:05 +08:00
Letter N
5304029dd9 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-23 11:01:42 +08:00
silicons
f1392307d9 Merge pull request #14235 from Vynzill/junglechanges
Jungle gateway nerf and touch ups: ape edition
2021-02-21 14:52:57 -07:00
Letter N
7d39949a2f Merge remote-tracking branch 'origin/master' into rustsql 2021-02-19 12:38:32 +08:00
Letter N
037378eb7d Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-19 10:34:47 +08:00
Dan-Neposh
2ec2f55eb7 updates fork 2021-02-17 12:03:28 -05:00
silicons
e009b9ef5f Merge pull request #14186 from SmArtKar/trading_card_game
[READY][PORT] Codename: Blue Eyes White Jumpsuit, the Citadel TCG. Part 1
2021-02-17 01:30:13 -07:00
Letter N
b3bfeb9858 it does not exist 2021-02-16 20:42:42 +08:00
Vynzill
5d001fc4b3 rice hat fix 2021-02-12 16:13:59 -06:00
Vynzill
3d7e74ba66 less loot more danger
touches stuff up, removes gamer loot, buffs a frog and adds apes.
2021-02-11 23:44:54 -06:00
DeltaFire
a041445bd5 Merge pull request #14220 from Hatterhat/what-atvs-question-mark
what atvs? - replaces the snowcabin ATVs with snowmobiles
2021-02-11 05:00:16 +01:00
DeltaFire
6bcee44179 Merge pull request #14221 from MrJWhit/delta-station-fix
Random delta station fix
2021-02-11 04:33:30 +01:00
MrJWhit
dba9fd7134 Update DeltaStation2.dmm 2021-02-10 00:04:44 -05:00
Hatterhat
fc88f27c85 what atvs? 2021-02-09 22:40:00 -06:00
MrJWhit
94b507dbf3 Update BoxStation.dmm 2021-02-09 16:31:58 -05:00
MrJWhit
c7f6c037f5 Boxstation disposals update 2021-02-06 16:31:30 -05:00
SmArtKar
348f57968f Adds unique ruin cards and Exodia cards) 2021-02-04 16:42:55 +03:00
MrJWhit
ce675498f4 Gee kevin, why does atmos get /two/ air alarms? 2021-01-28 14:22:01 -05:00
silicons
34cb148232 Merge pull request #14067 from TripleShades/box-chapel
Box Chapel Redecoration [updated]
2021-01-27 19:11:20 -07:00
silicons
b746386046 Merge pull request #14131 from MrJWhit/air-alarm-fixes
Mass air alarm fixings for (basically) every station
2021-01-25 23:03:55 -07:00
silicons
efecc1804b Merge pull request #14114 from Hatterhat/fgs
itt: i dont test my code again - free golem ship GPSes start disabled
2021-01-25 22:59:09 -07:00
TripleShades
b13c2de218 fuck 2021-01-25 11:48:13 -08:00
TripleShades
3ae6d63290 i can always change it back right 2021-01-25 11:24:40 -08:00
MrJWhit
661a5e6580 WHOOPS DIDN'T MEAN TO DELETE THAT 2021-01-23 03:53:36 -05:00
MrJWhit
d8f76a023b Tada 2021-01-23 03:44:55 -05:00
Dan-Neposh
c38e5ca446 puts the eminence spire back in Reebe until the eminence vote changes 2021-01-21 23:46:21 -05:00
Hatterhat
95db018de8 itt: i dont test my code again 2021-01-20 18:34:57 -06:00
silicons
66874fe252 Merge pull request #14083 from shellspeed1/alternative-xeno-hive
Removes the queen, and increases xeno variety in lavaland xenomorph ruin.
2021-01-20 15:22:06 -07:00
silicons
30755bfeb9 Merge pull request #14078 from MrJWhit/metastation-toxins-fix-2-electric-bogaloo
Gives metastation toxins storage a scrubber 'n vent
2021-01-20 15:21:55 -07:00