106 Commits

Author SHA1 Message Date
SandPoot a65f323734 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit 2024-03-08 19:10:22 -03:00
SandPoot c7a2565255 stop this nonsense 2024-01-05 00:28:56 -03:00
SandPoot 40f1d7401d procs 2023-11-29 22:40:13 -03:00
SandPoot 3c7e79d384 do after update 2023-09-09 15:39:49 -03:00
Putnam3145 65806b4e9f please... 2022-08-17 00:00:52 -07:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
Putnam3145 f77495f45d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-06-21 02:19:51 -07:00
silicons a8b7c07f00 Update open.dm 2021-06-17 07:07:49 -07:00
Putnam 86177c51c4 auxgm part 1
see also https://github.com/Baystation12/Baystation12/blob/dev/code/modules/xgm/xgm_gas_data.dm
2021-06-08 09:54:28 -07:00
Putnam 1c17570ea8 works but leaks 2021-05-30 00:28:51 -07:00
Putnam 51100c9bf9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-01-20 18:38:52 -08:00
Letter N 02ca168df3 why are we building windows facing nothing but rock infront of it? 2021-01-20 11:37:44 +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
silicons dafc6bf89f fix 2020-12-26 20:41:21 -08:00
silicons 6044086de0 changes 2020-12-26 20:29:52 -08:00
Putnam 30fb673670 Superconductivity is gone. Only rustmos now. 2020-11-17 02:35:10 -08:00
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
Putnam fb17f0cc75 Somehow made monstermos over 100x as fast 2020-09-10 04:48:55 -07:00
Putnam 17826fe98b monstermos wow 2020-05-11 22:00:04 -07:00
Putnam e8d7da56f4 Ported C++mos from yogs (help me) 2020-05-11 15:44:26 -07: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
kevinz000 0e3193e929 relatively small 71 file 700 lines changed refactor/rework to combat mode/sprint and some miscellaneous things that totally aren't important (#11376)
* combat refactoring

* i hate this

* mobility flags part 2 time xd

* whew

* stuff

* a

* ok

* changes

* Wew

* k

* add flags

* FUCKYOUVORE

* fixes

* typo

* no using this in hard stamcrit

* update icon

* woopsy

* . = ..()

* sigh

* Update living_combat.dm

* wew

* wups

* fix

* i hate you

* wrong button

* k

* ok

* bet

* k

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* early returns

* skreee

* agony

* k

* k

* k

* k

* wack

* compile

* wack

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-21 16:04:26 +01:00
kevinz000 bfb8139225 DefaultCombatknockdown 2020-02-25 03:18:37 -07:00
Ghommie 07b6d278a1 fixed and brutalized clown op slippery weapons a little. 2020-02-01 04:48:40 +01:00
Ghommie 5bf252a58c Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls." 2019-12-17 01:57:56 +01:00
Ghommie 641ddebed1 Ports "Uses defines for turf atmos" 2019-11-17 03:19:35 +01:00
kevinz000 6909857e04 Merge pull request #9632 from Ghommie/Ghommie-cit281
Porting multi-z support updates.
2019-11-14 15:58:53 -07:00
Ghommie 19a511929d and "Replaces the slime extract in the clown biodome with a superlube sprayer." 2019-11-11 23:39:03 +01:00
Ghommie e50c56150e ports "Adds superlube to the clown ruin" and buffs clown PDAs 2019-11-11 23:10:22 +01:00
Ghommie a2f9aaf899 Porting "Adjacent Atmos subsystem revival" 2019-10-28 17:04:31 +01:00
Ghommie 4aa1d55abb Porting multi-z support updates. 2019-10-27 16:32:32 +01:00
Poojawa f57bdc39a2 I still fucking hate components. 2019-09-23 02:03:37 -05:00
Poojawa 23333f6ea5 reverts the majority of clean act because it doesn't work properly otherwise 2019-08-20 23:03:31 -05:00
Poojawa 0290a46ddc Impliments Ghom review, reverts blood list back to component 2019-08-15 12:32:44 -05:00
Poojawa 283b5d050e Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-08 16:51:53 -05:00
Poojawa 3499d73f6b Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods 2019-07-31 19:24:39 -05:00
Ghommie 7b681f4129 Fixes jogging on wet tiles actually slipping you if you have less than 20 stamloss. 2019-07-28 19:35:53 +02:00
Poojawa 1f1f951924 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-06-03 05:35:52 -05:00
deathride58 4fc31f6322 Merge branch 'master' into fuckatmos 2019-05-25 15:34:06 -04:00
Poojawa 971ddef989 reverts forensics components. If I can't figure it out, MURDER IT 2019-05-22 04:10:29 -05:00
Nero1024 2a4a656a4d Port new footsteps from tg 2019-05-17 18:10:03 -05:00
deathride58 41375d9737 Increases performance significantly by turning garbage collection into a define 2019-04-14 11:33:28 -04:00
deathride58 2c9deab42e removes add_gas() and assert_gas(). next up: do further testing with garbage_collect() present and not present 2019-04-14 10:33:39 -04:00
deathride58 8b75240d89 fuck atmos - attempts to optimize atmos by removing GAS_META from the gas mixture meta list and removing the usage of gas archive 2019-04-11 17:07:11 -04:00
deathride58 7ece5aa1c3 Water will no longer slip jogging spaceman, but only if the jogging spaceman has less than 20% staminaloss 2019-02-27 08:16:54 -05:00
kevinz000 1034a6ad0e ball stuff 2018-12-16 03:41:37 -08:00
deathride58 b230f1a1ea Fixes wavedashing 2018-12-05 19:49:14 -05:00
deathride58 81cb475b2c atomizes some of the med rework's stamina tweaks - you can now scramble on the ground while in hard stamcrit, and the more staminaloss you take while in stamcrit decreases the amount of staminaloss you'll take for the entirety of your time in stamcrit (#7689) 2018-10-30 19:32:03 -07: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