Commit Graph

167 Commits

Author SHA1 Message Date
Hatterhat
469387881f live eggs? in 2021? (#15216)
Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
2021-09-29 20:18:11 +02:00
dapnee
20f1d8b57b Pubby and Beach Away Fixes
The one vent bothered me enough to make a map edit.
2021-09-17 04:32:28 -06:00
zeroisthebiggay
7717c7446c Update SnowCabin.dmm 2021-09-07 19:39:29 -04:00
zeroisthebiggay
6a900e4ec4 Update SnowCabin.dmm 2021-09-07 19:38:40 -04:00
Putnam3145
cc0fb99029 Adds some showers to the beach 2021-08-18 10:19:29 -07:00
silicons
a9a12cab54 missed that 2021-04-27 01:00:20 -07:00
silicons
47489c21d6 Merge remote-tracking branch 'citadel/master' into auxtools-atmos 2021-04-27 00:59:45 -07:00
LetterN
292f67e098 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-20 20:36:56 +08: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
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
Putnam
f07a9c13fb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-03-02 01:44:58 -08: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
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
Hatterhat
fc88f27c85 what atvs? 2021-02-09 22:40:00 -06:00
Putnam
d8e408d1f1 Fixed some major incompetency from 2018.
// If someone will place 0 of some gas there, SHIT WILL BREAK. Do not do that.
LINDA_turf_tile.dm, line 16.
2021-01-24 13:26:47 -08:00
Putnam
158dd11d8d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-01-19 17:52:40 -08:00
Putnam
e32dbd1d03 thanks away missions, very cool 2021-01-07 05:36:30 -08:00
MrJWhit
abffac67b2 Port'n 2021-01-06 03:16:08 -05:00
silicons
2b273addf1 Merge pull request #13618 from Vynzill/mappinghell
new jungle gateway map
2020-11-07 00:19:11 -07:00
Ghommie
90c4cb2022 Here I fix a few issues. 2020-10-25 14:50:42 +01:00
Vynzill
ff6850b9b0 jungle gateway map 2020-10-23 15:11:27 -05:00
Vynzill
5f75151c51 junglemap 2020-10-21 17:00:28 -05:00
Detective Google
86871a92fc fixes the door bolts on the snow cabin 2020-10-02 11:41:43 -05:00
dapnee
cb17ea4874 More Active Turf Fixes
None of these nerds make their map names logically and it's hard to find which is which wihout going through a hundred of them.
2020-08-04 12:16:29 -06:00
silicons
267186a5d3 Merge pull request #12646 from Chiirno/emi
[READY] Alt-click cigarette pack functionality added to pill bottles.
2020-07-20 16:15:38 -07:00
Cirno
020da9fa07 i hope this works 2020-07-04 15:47:38 -03:00
Artur
6ee1eba56c Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-02 23:23:47 +03:00
Artur
0e51afade9 Mhhhmmm pure !!fun!! 2020-07-02 02:06:27 +03:00
Artur
3bcfe84c35 People, do you realize gateways dont need cabling? 2020-07-02 01:58:49 +03:00
Artur
2931c03ccb Ghommie fixes
strongDMM autofixed wildest, hopefully it didnt break anything
2020-07-02 01:48:28 +03:00
Ghommie
9dc4b99620 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-30 00:49:06 +02:00
Artur
765ffdb1a1 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-26 14:03:27 +03:00
Detective Google
5b0886a150 and that's all folks (for now) 2020-06-22 20:32:12 -05:00
Detective Google
a406927c95 euthanizes spacebattle, helps wildwest a little (it's still shit) 2020-06-22 20:31:14 -05:00
Detective Google
98756b3bc7 snowdin is wack 2020-06-22 20:24:19 -05:00
Detective Google
46805bc872 more progress 2020-06-22 20:11:18 -05:00
Detective Google
a8b6bb7957 step 2; de-looting the caves 2020-06-22 19:46:48 -05:00
Detective Google
dc81519380 whoops me forget to hit save first 2020-06-22 19:29:01 -05:00
Detective Google
d4dd1a162a loot-yeet #1; wizard academy 2020-06-22 19:28:47 -05:00
Ghommie
de77b7139c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-23 00:13:14 +02:00
Artur
c41d2e78be Conflicts!!! 2020-06-22 17:39:24 +03:00
Detective Google
4e26916502 Merge remote-tracking branch 'upstream/master' into bald-bald-bald-bald-bald-bald-bald 2020-06-20 14:00:14 -05:00
Detective Google
898480af84 fixes some missing icon statesa on moonoutpost and UO45 2020-06-17 19:48:28 -05:00
Detective Google
0e1db216c8 Ports the reworked snowcabin and beach away missions by Jerry Derpinson (the baldy) 2020-06-17 19:33:14 -05:00
SmArtKar
170a38a3a7 Porting sutures and meshes from /TG/ (#12532)
* Porting sutures and meshes from /TG/

* Recipes fix
2020-06-16 16:22:56 -07:00
Artur
78ff5727cd Hopefully fixed the away mission gateways 2020-06-16 21:18:58 +03:00
Artur
bc30fb7710 Hard resets _maps to master 2020-06-16 16:09:05 +03:00
Artur
ffb2678eb0 Lets hope this fixes it 2020-05-22 22:52:41 +03:00
Ghommie
30ab79e09e Porting the twohanded component. 2020-05-17 18:16:53 +02:00