Commit Graph

81 Commits

Author SHA1 Message Date
silicons 19f1e99a8c mass ports like 15 tg prs + counting (#13386)
* changes

* ok

* changes

* sigh

* fixes

* changes

* fix

* fix

* alright

* fixes
git pus

* fix

* fix

* fix

* test

* ok

* Update code/modules/paperwork/ticketmachine.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>

* ok

* compile and other stuff

* ok

* fix

* fix

* Fix

* Update menu.dm

* Update view.dm

* Update preferences.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2020-10-10 12:20:33 +02:00
lolman360 6c57dce54e WX 2020-08-09 23:52:21 +10:00
lolman360 17d1fd0692 fixes 2020-07-22 12:42:46 +10:00
Rohesie 2857a13933 nested (#12381) 2020-05-28 14:12:58 +02:00
Detective Google 806966cd75 fixes the second level not spawning any rocks (and therefore no glass) while I have a PR open 2020-05-09 17:51:45 -05:00
Detective-Google bd37d45334 Ports TG Icemoon framework and map (#49680) (#12002)
* ports all the tg junk for icemoon, not yet changed to make it all compile

* fixes

* fixes

* fixes

* fixes

* fixes

* new stuff

* whew

* fixes

* it compiles, now to fix the maps

* fixes the maps

* fixes solars + removes the space tiles in the toxins burn chamber

* nukes the SpawnTerrain proc used for tg geysers

* linter fix

* fix

* fixes the non matching turf atmos (hopefully)

* more mapping fixes

* dmm2tgm

* unfucks changeturf for the more_caves

* fixes the volanic subtypes of the other thing

* fixes the stupid fucking tile placing list

* some map fixes, fixes the station_ruin loader shitting out errors this commit took 2 hours of my fucking life

* fixes a bunch of mismatch atmos in ruins

* fixes wendigo cave having no air

* backwards couch backwards couch

* fixes the SM up

* wendigos can't runtime when butchering if you can't butcher them 😎

* makes the wendigo fight have the same atmos as the surrounding icemoon

* Tweaks atmos mixture from o2=22;n2=82;TEMP=180 to o2=18;n2=63;TEMP=180, making lavaland weapons actually work

* makes the wendigo screech shake not completely aids

* fixes snowlegion portals dropping proper legions instead of skeles

* brings the engioutpost ruin over as well

* whoopps

* empty commit to reroll bots

* Fixes pirates, ops, the mining base, and gives pirates and ops drills

* fixes lone ops and ninjas

* fixes the snowed plating getting fucked when tiles are placed on it

* removes some OP junk from the wabbajack pool (aka removes non-antag headslugs again)

* more bug fixes

* empty commit to reroll bots

* hopefully finally kills the active turfs on the library ruin

Co-authored-by: kevinz000 <2003111+kevinz000@users.noreply.github.com>
2020-05-07 14:46:16 +02: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 641ddebed1 Ports "Uses defines for turf atmos" 2019-11-17 03:19:35 +01:00
Ghommie 2c578ca683 Ports move force and move resist, movement/pushing/pulling tweaks & co. 2019-10-24 18:01:46 +02:00
Nero1024 2a4a656a4d Port new footsteps from tg 2019-05-17 18:10:03 -05:00
Poojawa d231018a3a Flashy flash and Gondola Pods
and cult effect addition, fixes CTF
2018-09-21 02:48:17 -05:00
Poojawa 1a2460ed28 Continous update intergration until being merged
Also tgui fixes/updates
2018-09-15 00:37:29 -05:00
Poojawa 42db44b39e Alien Ruin fix, various cherrypicked upstream fixes
Also adds new buildmode
2018-09-13 22:55:11 -05:00
Poojawa 8b9ef1e400 Game folder 2018-09-11 04:06:45 -05:00
deathride58 91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04:00
Jordan Brown a14bc0615d Merge pull request #38644 from AutomaticFrenzy/patch/cameranet
Port AI static to vis_contents
2018-06-25 20:23:32 -05:00
Emmett Gaines 1f3bbebe0a Moves arch component application to where archdrops is defined (#38487) 2018-06-16 06:17:48 -05:00
CitadelStationBot 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
CitrusGender 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
Jordan Brown 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
Poojawa cc6b320f83 game folder 2018-04-23 00:17:28 -05:00
LetterJay 8e293a20aa Update asteroid.dm 2018-04-12 07:04:33 -05:00
ninjanomnom 5af97c3edc Removes some duplicated code 2018-04-11 15:01:10 -05:00
deathride58 e0d7630c19 Merge branch 'master' into synctesting 2018-04-09 21:43:26 +00:00
vuonojenmustaturska d0075b37b3 Fixes a turf runtime (#37038) 2018-04-08 19:22:14 -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
Grandmother of 50 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
kevinz000 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
CitadelStationBot 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
CitadelStationBot 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
deathride58 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
vuonojenmustaturska 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
Tad Hardesty 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
CitadelStationBot 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
CitadelStationBot 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
MMMiracles 4c6bdf1a9e Snowdin 2.0 2018-02-05 09:10:40 -06:00
Emmett Gaines a2bc36a791 makes the lavaland mining base have more correct baseturfs (#34325) 2018-01-15 08:43:08 -06:00
LetterJay 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
Tad Hardesty 0418ee4df6 Replace explicit z-level checks with defines 2017-12-29 13:41:10 -06:00
Emmett Gaines 9d0a4722e5 turns the baseturf var into a part time list (#33705) 2017-12-25 19:11:06 -06:00
Emmett Gaines f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
Jordan Brown e1f658a50d Removes ComponentActivated in favor of callbacks 2017-12-05 15:42:47 -06:00
Tad Hardesty 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
Tad Hardesty 6f06e690a4 Fix double progress bars when digging basalt (#32306) 2017-11-02 04:11:07 -05:00
ShizCalev 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
Jordan Brown 9d448fda76 Merge pull request #31602 from AnturK/tunnels
Fixes diagonal tunnels
2017-10-13 09:14:34 -05:00
kevinz000 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
CitadelStationBot 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