58fc679cce
WIP
2020-04-24 20:49:15 +02:00
2134515d5c
Merge remote-tracking branch 'upstream/master' into tackling_and_lunge
2020-04-15 12:19:37 +03:00
fe755a1424
Tackling Working so far, working on the lunge now
2020-04-09 21:42:00 +03:00
295a4e0238
ass-covering ( #11788 )
2020-04-09 16:19:57 +02:00
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
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
62509ab4a9
the mapping side
2020-04-04 10:16:43 -04:00
86898cc451
Force pushed updates
2020-03-22 01:43:19 +01:00
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
8566e2396d
Brings in some mapping code updates.
2019-12-19 00:44:14 +01:00
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
2c1740f56e
#43012 and missing typepaths aaaa
2019-11-13 23:26:03 +01:00
aa441fba5d
Ports Improved beach away mission.
2019-11-13 22:52:39 +01:00
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
f6feeb93ea
Mapping in arcade dirs.
2019-10-30 16:47:44 +01:00
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
2c578ca683
Ports move force and move resist, movement/pushing/pulling tweaks & co.
2019-10-24 18:01:46 +02:00
5db9b3432f
Update moonoutpost19.dmm
2019-09-12 00:19:56 -05:00
dcbcf704da
I accidentally all the maps. whoops
2019-08-04 06:27:28 -05:00
3499d73f6b
Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods
2019-07-31 19:24:39 -05:00
589cdae0e1
Towels
2019-07-18 00:03:49 +02:00
689cb34347
Update wildwest.dmm
2019-05-14 20:19:55 -05:00
6478c21731
,
2019-05-14 16:00:00 -05:00
b03a84e4d6
do we even use this shitty away mission
2019-05-14 03:42:14 -05:00
45e912cc6c
map editing is nicer with notepad ++ at least
2019-05-14 03:30:00 -05:00
3f6cd92d54
Ok this time all of them are nitpicked
2019-05-09 10:15:51 -05:00
0f02562b51
Fixes Xenomorph blood related travis errors
2019-05-09 09:59:34 -05:00
e6597a192a
Fixed duplicate turfs
2019-04-14 00:04:24 -05:00
ec76f36099
plz fuck off with these map changes kthx
2018-09-11 12:51:45 -05:00
fa70720cc1
Map Conversions
2018-09-11 08:58:34 -05:00
db2a15d42d
maps, tools, goon folder, icons, sounds, and strings. everything except code
2018-07-01 23:54:31 -04:00
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
3369c804b2
Kills off /obj/item/device ( #6561 )
2018-04-30 00:06:58 -05:00
0d5d992732
compile fixes + initial map port
2018-04-23 03:37:10 -05:00
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
2d8b007086
Refactors Spell and Martial Art Books to use Action Granters!
2018-03-28 12:18:06 -05:00
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
1d6d8b454c
[MIRROR] Defaults auxbase/escape pod/assault pod/elevator port timidity to FALSE ( #6017 )
...
* Defaults auxbase/escape pod/assault pod/elevator port timidity to FALSE
* FUCK (#36483 )
F A L S E
semicolon be gone
2018-03-19 21:12:46 -05:00
6c7da493d9
Reee mirror bot. Hard syncs some missed PR stuff + maps ( #5951 )
...
* maps and tgui
* missed defines and helpsers
* controller things
* datums
* game folder stuff
* module things
* icons
* stragglers
* map sync and updating
wew lad
2018-03-14 16:49:40 -05:00
a999863e5c
[MIRROR] Fixes mirror var desync ( #5883 )
...
* Fixes mirror var desync (#36251 )
* Fixes mirror var desync
2018-03-10 07:17:52 -06:00
a62aa577f1
Merge pull request #5854 from Citadel-Station-13/upstream-merge-36055
...
[MIRROR] Techwebs update: Protolathe/Circuit imprinters combined into techfabs!
2018-03-09 19:25:12 +00:00
91ac70a73e
RND TECHWEBS: TECHFABS ( #36055 )
...
Doing my little update piece by piece because I'm lazy and because storage PR is going to conflict everything ever.
Techfabs do not link to RND consoles, and have their own interface for producing things.
RND production machinery code refactored.
Techwebs have categories views instead of just a goddamn design list.
Old machinery will be kept in, as some places will keep them. Read: Engineering, robotics, etc.
experimental: Protolathes and circuit imprinters combined/changed to techfabs. All departments can now print related circuit boards. Engineering and science will keep their lathe/imprinter design by default at roundstart because they have specialized labs for those.
2018-03-07 21:11:56 -06:00
72e3ffa562
Beacons are no longer radios ( #36070 )
...
* Refactors beacons
* Updates maps
* Done
* aaddddasddsafsdf
2018-03-07 14:43:25 -06:00
afb1ab021b
Removes SNPCs ( #36016 )
...
* he's dead, jim
* a few stragglers
* Restores the populate world-verb
2018-02-28 00:12:12 -06:00
21179c9105
Merge pull request #5631 from Citadel-Station-13/upstream-merge-35733
...
[MIRROR] [s] Cameranet fixes
2018-02-23 13:21:23 +00:00
862a229652
[MIRROR] Removes input/output plates and their last remaining use ( #5658 )
...
* Removes input/output plates and their last remaining use (#35800 )
* - Removes input/output plates and their last remaining use
* - ok fine updates the map too
* - loco loco
* Removes input/output plates and their last remaining use
2018-02-22 23:38:48 -06:00
d2ba2bf0c1
[s] Cameranet fixes ( #35733 )
2018-02-21 07:31:27 -06:00
7d488e8f4c
Citadel'd Maps from #5523 ( #5551 )
...
* #5523 commit + sanity upload
* reee
* Syncs home brew CItadel changes
* updates cit_map_files
* reee.
2018-02-17 18:04:28 -06:00
c58a9c4a27
Merge pull request #35654 from ShizCalev/snowdin-fix
...
Fixes turret faction on snowdin map
2018-02-15 10:39:34 -06:00
ebd82bfe50
Merge pull request #35518 from ShizCalev/ACCESS-FIXES-MK2
...
Actually fixes broken accesses
2018-02-11 15:48:40 -06:00
Ghommie