Commit Graph

125 Commits

Author SHA1 Message Date
Cirno
020da9fa07 i hope this works 2020-07-04 15:47:38 -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
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
Ghommie
757706653d Map paths. 2020-05-12 21:01:34 +02:00
Ghommie
58fc679cce WIP 2020-04-24 20:49:15 +02:00
Artur
2134515d5c Merge remote-tracking branch 'upstream/master' into tackling_and_lunge 2020-04-15 12:19:37 +03:00
Artur
fe755a1424 Tackling Working so far, working on the lunge now 2020-04-09 21:42:00 +03:00
Putnam3145
295a4e0238 ass-covering (#11788) 2020-04-09 16:19:57 +02:00
kevinz000
b8548f521b Merge pull request #11746 from Trilbyspaceclone/found_and_hidden
Atomic PR 1 or 2 - Toilet Mapping!
2020-04-09 02:11:43 -07:00
kevinz000
8b2132317b Ports a rewritten version of BAYSTRUMENTS (#11680)
* bay instruments

* k

* AAA

* remove that

* changes

* Update _instrument_key.dm

* safety nets

* @ghommie fixed

* volume

* Update item.dm

* Update item.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-04-07 15:21:50 +02:00
TrilbySpaceClone
62509ab4a9 the mapping side 2020-04-04 10:16:43 -04:00
Ghommie
86898cc451 Force pushed updates 2020-03-22 01:43:19 +01:00
Ghommie
686a76dd1d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-04 13:35:05 +01:00
Ghommie
8566e2396d Brings in some mapping code updates. 2019-12-19 00:44:14 +01:00
Ghommie
542c9007ee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-12-06 20:09:35 +01:00
Ghommie
2c1740f56e #43012 and missing typepaths aaaa 2019-11-13 23:26:03 +01:00
Ghommie
aa441fba5d Ports Improved beach away mission. 2019-11-13 22:52:39 +01:00
Ghommie
09860d463f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-11-10 23:23:36 +01:00
Ghommie
f6feeb93ea Mapping in arcade dirs. 2019-10-30 16:47:44 +01:00
Ghommie
5fcf5b1c5e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-10-29 13:38:16 +01:00
Ghommie
2c578ca683 Ports move force and move resist, movement/pushing/pulling tweaks & co. 2019-10-24 18:01:46 +02:00
Poojawa
5db9b3432f Update moonoutpost19.dmm 2019-09-12 00:19:56 -05:00
Poojawa
dcbcf704da I accidentally all the maps. whoops 2019-08-04 06:27:28 -05:00
Poojawa
3499d73f6b Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods 2019-07-31 19:24:39 -05:00
Ghommie
589cdae0e1 Towels 2019-07-18 00:03:49 +02:00
Poojawa
689cb34347 Update wildwest.dmm 2019-05-14 20:19:55 -05:00
Poojawa
6478c21731 , 2019-05-14 16:00:00 -05:00
Poojawa
b03a84e4d6 do we even use this shitty away mission 2019-05-14 03:42:14 -05:00
Poojawa
45e912cc6c map editing is nicer with notepad ++ at least 2019-05-14 03:30:00 -05:00
Poojawa
3f6cd92d54 Ok this time all of them are nitpicked 2019-05-09 10:15:51 -05:00
Poojawa
0f02562b51 Fixes Xenomorph blood related travis errors 2019-05-09 09:59:34 -05:00
Poojawa
e6597a192a Fixed duplicate turfs 2019-04-14 00:04:24 -05:00
Poojawa
ec76f36099 plz fuck off with these map changes kthx 2018-09-11 12:51:45 -05:00
Poojawa
fa70720cc1 Map Conversions 2018-09-11 08:58:34 -05:00
deathride58
db2a15d42d maps, tools, goon folder, icons, sounds, and strings. everything except code 2018-07-01 23:54:31 -04:00
deathride58
2f9e3e403d Hard upstream sync (#6951)
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
Poojawa
0d5d992732 compile fixes + initial map port 2018-04-23 03:37:10 -05:00
Poojawa
5fa001c10f things with stuff (#6233)
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00
Armhulen
2d8b007086 Refactors Spell and Martial Art Books to use Action Granters! 2018-03-28 12:18:06 -05:00
CitadelStationBot
bb1aaf01e7 [MIRROR] Plastic flaps are now airtight (#6098)
* Plastic flaps are now airtight (#36659)

* flaps

* fucking flaps, how do they work?

* Plastic flaps are now airtight
2018-03-26 04:20:12 -05:00