Commit Graph

1995 Commits

Author SHA1 Message Date
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
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
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
Putnam3145
f7f9185073 Merge pull request #13826 from LetterN/semi-sync
/tg/ ""hardsync"" part one of many*
2021-01-19 17:22:05 -08:00
silicons
dedb0cb62e Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-19 04:24:42 -07:00
shellspeed1
450937a8f3 Update lavaland_surface_alien_nest.dmm 2021-01-18 15:27:40 -08:00
TripleShades
eb20501cc0 oops missed this light switch from earlier box surgery pr 2021-01-18 11:50:41 -08:00
MrJWhit
4f49dab040 Update Mining_Station_Public_01.dmm 2021-01-18 01:57:05 -05:00
shellspeed1
bbd3fd54ba fixed map alteration I think 2021-01-17 19:44:18 -08:00
shellspeed1
eabecb1618 Revert "Reworks lavaland xeno ruin a bit"
This reverts commit e8e92cb805.
2021-01-17 18:07:48 -08:00
shellspeed1
e8e92cb805 Reworks lavaland xeno ruin a bit 2021-01-17 18:01:38 -08:00
MrJWhit
0c45aab261 Update MetaStation.dmm 2021-01-17 04:45:55 -05:00
MrJWhit
5f5c7667df Update MetaStation.dmm 2021-01-17 03:48:41 -05:00
TripleShades
1c9c0b7745 Update BoxStation.dmm 2021-01-15 17:42:36 -08:00
TripleShades
36e82c59d6 Update BoxStation.dmm 2021-01-15 17:30:10 -08:00
TripleShades
1f1605bbb6 Update BoxStation.dmm 2021-01-15 16:54:24 -08:00
MrJWhit
68f8258f82 Teehee oops 2021-01-15 09:52:39 -05:00
MrJWhit
02abd90e1f Update PubbyStation.dmm 2021-01-15 09:45:32 -05:00
silicons
ea07ad6e48 Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-13 15:41:28 -07:00
DeltaFire
6bdca6b8e4 Merge pull request #14033 from BlueWildrose/colormateys
Adds Color Mates to every station (except Snaxi)
2021-01-13 18:39:40 +01:00
Hatterhat
cb40ad4764 atomization is cowardice actually 2021-01-12 16:08:17 -06:00
Blue Wildrose
5436db5f3b Add a color mate to the ghost cafe as well, yeah 2021-01-12 13:55:42 -07:00
Blue Wildrose
32aa851062 somethings up with the HoS pet carp on Kilo, fixing that 2021-01-12 06:54:06 -07:00
Blue Wildrose
8111757e5b oops messed something up with kilo 2021-01-12 06:49:31 -07:00
Blue Wildrose
2ab6a5cf96 Adds Colormates to every map except Snaxi 2021-01-12 06:26:13 -07:00
silicons
ddad368d6a Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-08 00:33:57 -08:00
MrJWhit
cb7d81a8e1 Update MetaStation.dmm 2021-01-08 02:41:45 -05:00
MrJWhit
8108109965 Fixes a mistake on metastation 2021-01-06 18:04:40 -05:00
MrJWhit
abffac67b2 Port'n 2021-01-06 03:16:08 -05:00
silicons
e4e029a061 Merge pull request #13961 from MrJWhit/snipping-the-ai-thread
Fuck it, I'll just fix a whole bunch of stuff on cogstation
2021-01-05 23:40:07 -07:00
silicons
e6aac9d4fb Merge pull request #13970 from TripleShades/fixies-oops
Meta Surgery Fixies
2021-01-05 23:39:53 -07:00
TripleShades
3bb244410c oops leftover decal 2021-01-05 22:13:57 -08:00
MrJWhit
98520dc519 Update CogStation.dmm 2021-01-05 19:38:30 -05:00
MrJWhit
ab856c75bb Update CogStation.dmm 2021-01-05 19:25:44 -05:00