Commit Graph
336 Commits
Author SHA1 Message Date
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 2ff75d8c99 commenting lines. 2020-04-24 23:20:05 +02:00
Ghommie a9be1e06e2 Fixing stuff, it now should be ready. 2020-04-24 23:00:31 +02:00
Ghommie 58fc679cce WIP 2020-04-24 20:49:15 +02:00
GhomandGitHub 64647318df Merge pull request #11883 from Putnam3145/fix-dynamic-on-by-default
Makes dynamic voting not the default
2020-04-18 05:47:21 +02:00
kevinz000andGitHub 61f833b953 Merge pull request #11852 from Ghommie/Ghommie-cit681
Custom skin tone preferences.
2020-04-17 05:16:04 -07:00
Putnam 874e57a516 Makes dynamic voting not the default 2020-04-16 16:14:22 -07:00
Ghommie 2200c690f7 configs 2020-04-16 18:44:05 +02:00
Linzolle 2cbd6d20ea come on 2020-04-14 18:28:11 -05:00
kevinz000andGitHub 7861b044ea Merge pull request #11826 from Ghommie/Ghommie-cit675
Body size preferences! Oh no!
2020-04-14 01:35:46 -07:00
deathride58 53d893a67e adds rudimentary linux iptables support for fail2topic 2020-04-12 16:21:51 -04:00
Ghommie 4e3845da5e Clarifies the scope of the slowdown. 2020-04-12 09:53:41 +02:00
Ghommie 1afa07dad5 Improved readability. 2020-04-12 09:40:38 +02:00
Ghommie fe4b270568 Sprite size preferences?! Oh no! 2020-04-12 05:08:49 +02:00
e63dc08e66 More dynamic fixes, AKA if Ghommie keeps merging without telling me I will maybe get irate (#11688)
* Starting a replacement of how threat works.

* no, we do it this way

* Added threat levels to jobs

* Added threat to... a lot.

* Updated for traitor classes.

* Fixed errors, except for one.

It's consistently giving me "maximum number of internal arrays exceeded (65535)". I have no idea what could be causing this.

* Added type annotation to GetJob.

* This one I should change though

* wow how'd that happen

* spammable means low threat

* Made story threat have initial threat level on average

* Made somet rulesets force if they won the vote

* )

* Gave EVERY job threat, added a config for it.

* Rebalanced some numbers

* Update code/game/gamemodes/dynamic/dynamic_storytellers.dm

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

* Removes mush threat

* Makes devil threat scale with form

* reviewing reviewer's review of reviewer

* Gutlunches can be friendly spawned, so no

* Also made forced-friendly mobs not count

* null checks better

* Made antag threats in config, too

* various fixes

* Another couple dynamic fixes

* Made an admin message chunk all one line.

* Make roundstarts ignore current threat

It's not even calculated yet, so this is probably better.

* Minimum pop for chaotic/teamwork.

* More conveyance issues, removed superfluous threat costs

* More conveyance and tweaks

* Makes storyteller min players use all players instead of ready

* Lowered chaos weight with chaotic

* Blob now has correct cost

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-31 13:10:59 +02:00
8a620b0ebc More dynamic rework: help I wasn't done (#11642)
* Starting a replacement of how threat works.

* no, we do it this way

* Added threat levels to jobs

* Added threat to... a lot.

* Updated for traitor classes.

* Fixed errors, except for one.

It's consistently giving me "maximum number of internal arrays exceeded (65535)". I have no idea what could be causing this.

* Added type annotation to GetJob.

* This one I should change though

* wow how'd that happen

* spammable means low threat

* Made story threat have initial threat level on average

* Made somet rulesets force if they won the vote

* )

* Gave EVERY job threat, added a config for it.

* Rebalanced some numbers

* Update code/game/gamemodes/dynamic/dynamic_storytellers.dm

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

* Removes mush threat

* Makes devil threat scale with form

* reviewing reviewer's review of reviewer

* Gutlunches can be friendly spawned, so no

* Also made forced-friendly mobs not count

* null checks better

* Made antag threats in config, too

* various fixes

* Another couple dynamic fixes

* Made an admin message chunk all one line.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-28 14:46:37 +01:00
3d8084709b A dynamic rework: target threat levels (#11515)
* Starting a replacement of how threat works.

* no, we do it this way

* Added threat levels to jobs

* Added threat to... a lot.

* Updated for traitor classes.

* Fixed errors, except for one.

It's consistently giving me "maximum number of internal arrays exceeded (65535)". I have no idea what could be causing this.

* Added type annotation to GetJob.

* This one I should change though

* wow how'd that happen

* spammable means low threat

* Made story threat have initial threat level on average

* Made somet rulesets force if they won the vote

* )

* Gave EVERY job threat, added a config for it.

* Rebalanced some numbers

* Update code/game/gamemodes/dynamic/dynamic_storytellers.dm

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

* Removes mush threat

* Makes devil threat scale with form

* reviewing reviewer's review of reviewer

* Gutlunches can be friendly spawned, so no

* Also made forced-friendly mobs not count

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-25 17:40:37 +01:00
GhomandGitHub ff3e394402 OH NO 2020-03-22 03:25:27 +01:00
Ghommie 6d4433dd77 Size preferences made configurable. 2020-03-22 01:07:51 +01:00
Ghommie 0602e728c0 Doesn't delete the old auto transfer behavior. 2020-03-12 21:15:12 +01:00
Ghommie 663a849afe Makes the autotransfer subsystem a bit more optional. 2020-03-12 21:02:34 +01:00
GhomandGitHub 8878733fc1 Merge pull request #11317 from deathride58/WEPORTINSYNTHSBOI
Ports Skyrat's synths (Plus limb rendering overhaul and more)
2020-03-09 00:26:06 +01:00
deathride58 560192c45a Does the thing - PORTS THE BEEPERS! also fixes a bug where body markings dont render if their name doesnt match the iconstate 2020-03-03 15:49:25 -05:00
BlackMajor be740ba690 Merge branch 'master' into SpaceRuins 2020-02-26 20:58:46 +13:00
GhomandGitHub 5ee2f0dcd8 Merge pull request #11169 from PersianXerxes/ohHeyKilo
Ports Kilo Station from Skyrat
2020-02-25 14:48:37 +01:00
BlackMajor fc85f62546 Merge branch 'master' into SpaceRuins 2020-02-25 16:51:39 +13:00
GhomandGitHub 9355e9319b Merge pull request #11110 from Hatterhat/hyper-96-aus-unk
you kids like extend votes?
2020-02-24 16:39:16 +01:00
kevinz000andGitHub 43c17b4ab3 Merge pull request #11180 from Detective-Google/psych+paramedic
Adds epic and also cool paramedics [lazy tg port]
2020-02-24 02:30:36 -07:00
BlackMajor ca6341aac4 Merge branch 'master' into SpaceRuins 2020-02-24 19:47:52 +13:00
Persi 4af2eee9dd Haha, okay... this will break Kilo
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ohHeyKilo
2020-02-23 02:28:18 -05:00
Ghommie 8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01:00
Detective Google 4c10c830bf Merge remote-tracking branch 'upstream/master' into psych+paramedic 2020-02-20 22:17:55 -06:00
Detective Google a8f863f901 changes - sprites 2020-02-20 22:17:47 -06:00
Persi c4b4a90bd8 Oh hey it's KiloStation
Trying to make Kilo open...

Finally, the work begins!

Kilo added!

Kilo Station!
2020-02-20 00:58:54 -05:00
Hatterhat 0ad49f9004 shit dude i hope this works lmao 2020-02-19 17:18:51 -06:00
BlackMajor 9a54b451eb Added two more ruins, Owai's suggestions. 2020-02-18 12:57:48 +13:00
BlackMajor aff71e7f14 Initial Commit. Adds space ruins to station z. 2020-02-17 23:44:06 +13:00
Hatterhat c00f797a4a extendies 2020-02-16 01:26:33 -06:00
GhomandGitHub a4a9701c98 Merge pull request #11022 from kevinz000/ssprofiler
ports auto profiler subsystem from tg
2020-02-13 15:06:27 +01:00
kevinz000andGitHub 1ec098b39e shhhh 2020-02-11 08:00:56 -07:00
kevinz000 275fb6fc41 auto profiler 2020-02-11 07:54:17 -07:00
Ghommie 0caabe8018 Porting tgs DMAPI and script updates, as well as getrev updates and something bout OoM. 2020-02-11 15:23:03 +01:00
GhomandGitHub c2baad44d8 Merge pull request #10277 from kevinz000/god_wish_your_plushies_holy_shit
ENDS THE PLUSHIE DRAMA
2020-02-09 21:47:30 +01:00
kevinz000andGitHub 1f959012c5 Merge pull request #10918 from r4d6/dwarf-config
Add dwarves as a round-start race
2020-02-08 21:01:26 -07:00
Putnam d05c2426a8 Added a config for map voting types. 2020-02-06 15:47:04 -08:00
kevinz000andGitHub 62b0e62952 Merge pull request #10623 from Putnam3145/antag-overhaul
Better antag objectives: for real this time
2020-02-06 16:25:22 -07:00
r4d6 949587d671 dorf config 2020-02-05 11:48:19 -05:00
Ghommie 5dc1de1d04 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-05 04:34:54 +01:00
GhomandGitHub c24ffa8f1c Merge pull request #10840 from Putnam3145/easier_bunker
Save panic bunker between rounds
2020-02-04 21:15:37 +01:00
kevinz000 8910efadfa Merge remote-tracking branch 'citadel/master' into god_wish_your_plushies_holy_shit 2020-02-03 13:07:49 -07:00