8566e2396d
Brings in some mapping code updates.
2019-12-19 00:44:14 +01:00
641ddebed1
Ports "Uses defines for turf atmos"
2019-11-17 03:19:35 +01:00
2a4a656a4d
Port new footsteps from tg
2019-05-17 18:10:03 -05:00
d231018a3a
Flashy flash and Gondola Pods
...
and cult effect addition, fixes CTF
2018-09-21 02:48:17 -05:00
1a2460ed28
Continous update intergration until being merged
...
Also tgui fixes/updates
2018-09-15 00:37:29 -05:00
42db44b39e
Alien Ruin fix, various cherrypicked upstream fixes
...
Also adds new buildmode
2018-09-13 22:55:11 -05:00
8b9ef1e400
Game folder
2018-09-11 04:06:45 -05:00
91805b8789
and that just leaves the modules folder
2018-07-02 00:28:51 -04:00
a14bc0615d
Merge pull request #38644 from AutomaticFrenzy/patch/cameranet
...
Port AI static to vis_contents
2018-06-25 20:23:32 -05:00
1f3bbebe0a
Moves arch component application to where archdrops is defined ( #38487 )
2018-06-16 06:17:48 -05:00
d875c362fa
[MIRROR] Turf grammar omnibus ( #7104 )
...
* Turf grammar omnibus (#38375 )
* Fix plurality and propriety on turfs
Some turfs are marked tentatively plural in order to avoid an incorrect
choice of "a" or "an".
* Add an article var to handle unusual a/an
* An additional pass on turf names
* Decapitalize server, mainframe, killroom floors
* Turf grammar omnibus
2018-06-13 19:31:29 -07:00
bd6fb5f9e5
New directional beach sprites and corners for the 2018 Summer Ball ( #38262 )
...
* Adds beach corners, interior corners, and other sides in addition to the normal down direction.
* SOMEONE LIED TO ME
* Update misc_plating.dm
* don't copy paste at 4am
* okay there we go
2018-06-04 00:47:45 -05:00
a9d452a24d
Merge pull request #37549 from ShizCalev/bounce_away-fixes
...
Resolved var name conflict for bounce_away()
2018-04-30 12:51:40 -05:00
cc6b320f83
game folder
2018-04-23 00:17:28 -05:00
8e293a20aa
Update asteroid.dm
2018-04-12 07:04:33 -05:00
5af97c3edc
Removes some duplicated code
2018-04-11 15:01:10 -05:00
e0d7630c19
Merge branch 'master' into synctesting
2018-04-09 21:43:26 +00:00
d0075b37b3
Fixes a turf runtime ( #37038 )
2018-04-08 19:22:14 -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
2d710e863f
Archaeology... .... Code Cleanup (One day I promise!) ( #36490 )
...
* Improves Arch Code
* defines and stack_traces null values
* relocates 2 defines to "non-signal" section
2018-04-02 18:14:15 -05:00
f78fea7333
[READY] Refactors wet floors to a component ( #36130 )
...
* Wet Floor components
* No more turf wet slide.
2018-03-17 07:53:11 -05:00
d8faf15832
[MIRROR] Cleans up some spaces ( #5593 )
...
* Merge pull request #35811 from ShizCalev/spacing
Cleans up some spaces
* Cleans up some spaces
2018-02-19 10:27:17 -06:00
1d028256d2
[MIRROR] Slippery Ice Fix ( #5581 )
...
* Slippery Ice Fix (#35770 )
* Makes ice slippery again
* Update misc_plating.dm
* Slippery Ice Fix
2018-02-18 19:52:03 -06:00
d2e13833d6
Merge pull request #5496 from Citadel-Station-13/upstream-merge-35339
...
[MIRROR] Support stations with multiple z-levels
2018-02-17 21:24:48 +00:00
5ea2e57419
Merge pull request #35629 from ShizCalev/floor-tool_acts
...
Converts floor tool interactions to tool_act, fixes flooring exploits
2018-02-16 06:07:19 -06:00
5b30b29a4b
Support stations with multiple z-levels ( #35339 )
...
* Remove ZLEVEL_STATION_PRIMARY
* Add Up and Down traits for use by ladders and chasms
* Give map_config creation its own proc
* Combine LoadConfig and ValidateJSON and remove transition_config
* Make space linkage a z-level trait
* Remove ZLEVEL_EMPTY_SPACE
* Update uses of GetFullMapPath
* Handle multi-Z stations and load Lavaland and Reebe at runtime
* Remove unused space maps
* Fix inappropriate z-expansion in map reader, improve logging
* Update comments relating to z-level configuration
* Add Lavaland and Reebe to ALL_MAPS
2018-02-15 10:39:08 -06:00
717da969a6
[MIRROR] Var cleanup and map fixes ( #5359 )
...
* Merge pull request #35429 from ShizCalev/snowdin-cleanup
Var cleanup and map fixes
* Var cleanup and map fixes
2018-02-07 20:04:04 -06:00
7126b61205
[MIRROR] Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag ( #5327 )
...
* Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag
* really? Like, a dozen fucking map conflicts. this map was fucked entirely
2018-02-06 19:06:31 -06:00
4c6bdf1a9e
Snowdin 2.0
2018-02-05 09:10:40 -06:00
a2bc36a791
makes the lavaland mining base have more correct baseturfs ( #34325 )
2018-01-15 08:43:08 -06:00
30d4b25aee
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829
2018-01-01 14:09:07 -06:00
0418ee4df6
Replace explicit z-level checks with defines
2017-12-29 13:41:10 -06:00
9d0a4722e5
turns the baseturf var into a part time list ( #33705 )
2017-12-25 19:11:06 -06:00
f875d4e176
Defines math, take 2
2017-12-17 10:02:43 -06:00
e1f658a50d
Removes ComponentActivated in favor of callbacks
2017-12-05 15:42:47 -06:00
38c45fb479
Refactor chasm paths to be more sane ( #32701 )
...
In addition, makes chasm handling a component, so it could be reused for
chasm-likes which are not quite chasms.
Also fixes a couple of bugs relating to building on top of chasms
occasionally erasing the chasm.
2017-11-22 03:30:49 -06:00
6f06e690a4
Fix double progress bars when digging basalt ( #32306 )
2017-11-02 04:11:07 -05:00
272fcc0b5d
Stops plating subtypes from stating it has holes for rods & you can now only build ontop of it with tiles. ( #31788 )
...
* Stops plating types from stating rod holes
* More immersion. Stops building ontop with rods.
2017-10-17 13:37:25 -05:00
9d448fda76
Merge pull request #31602 from AnturK/tunnels
...
Fixes diagonal tunnels
2017-10-13 09:14:34 -05:00
1a3fc9f1c6
why plus a minus value and not just minus the value... ( #31279 )
...
* Update bullets.dm
* Update visuals_icons.dm
* Update asteroid.dm
2017-10-04 14:03:20 -05:00
4da91bc330
[MIRROR] Fixes Archaeology not working ( #2744 )
...
* Fixes Archaeology not working (#30547 )
* gg
* fixes that other issue
* ok
* okie dokie
* removes this devil
* Fixes Archaeology not working
2017-09-13 16:53:30 -05:00
2dc3868949
Makes shiny versions of lavaland monsters slightly more distinct ( #30502 )
...
* Makes shiny versions of lavaland monsters slightly more distinct
* classic
* lower drop
* tweak drops
* this is kind of absurd
2017-09-11 20:54:55 -05:00
33f36fd0de
Adds Archaeology Component
2017-09-08 10:02:01 -05:00
b9c58a2914
wew
2017-08-29 21:14:33 -07:00
719717934c
Makes the singularity eat asteroids, adds a planetary z-level list with a helper that adds maps to it
2017-08-29 17:10:59 -05:00
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
35b7b93b24
ok this is going to be a pain in the ass ain't it ( #2458 )
...
lets hope nothing blows up this time (Flags PR but it works!)
2017-08-22 05:01:38 -07:00
6a309b5996
Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" ( #2457 )
...
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
2017-08-22 04:04:21 -07:00
a0cf777040
Merge branch 'master' into upstream-merge-29940
2017-08-21 23:29:24 -05:00
eb0235792a
Singularities dig up asteroid turf
2017-08-19 18:41:38 -05:00
Ghommie