Commit Graph

504 Commits

Author SHA1 Message Date
Putnam3145
ee2fedd4af Merge pull request #12390 from Ghommie/Ghommie-cit800
Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event.
2020-06-29 12:44:33 -07:00
Ghommie
ae053a9a08 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit800 2020-06-23 03:12:49 +02:00
DeltaFire
6cababd09b yeeah no more free random nullcrates 2020-06-21 01:30:39 +02:00
Ghom
dd009ada48 Merge pull request #12542 from bunny232/scrubber
Removes lewd events from the vent clog event
2020-06-19 23:07:23 +02:00
kevinz000
118ac1a775 Merge pull request #12548 from timothyteakettle/more-events
ports several tg events including fugitives
2020-06-17 20:10:04 -07:00
Timothy Teakettle
d1432e20b0 woops make it back to 10 minutes 2020-06-16 23:54:44 +01:00
timothyteakettle
b59c8c1af6 fix maps 2020-06-16 02:44:11 +01:00
bunny232
8a1290b562 Update vent_clog.dm 2020-06-15 21:04:06 -04:00
bunny232
c9b1bbdb2c Update vent_clog.dm 2020-06-15 21:00:07 -04:00
Timothy Teakettle
7fbfb4ad0e Merge remote-tracking branch 'upstream/master' into embed-changes 2020-06-15 22:48:26 +01:00
Timothy Teakettle
d7bce8aec0 ports some events 2020-06-15 20:22:40 +01:00
Lin
bfe8ccdfb5 Merge pull request #11627 from kevinz000/combat_rework
"Unofficial" Combat Rework Part 3: Blocking/Parrying
2020-06-12 16:39:11 -05:00
Timothy Teakettle
4c55e86da7 part 2 2020-06-10 23:14:25 +01:00
Timothy Teakettle
95b8cd3956 first port 2020-06-10 20:33:01 +01:00
Timothy Teakettle
994ab8ac16 fixes spacevines 2020-06-06 16:00:26 +01:00
kevinz000
05fe0c7dcc ok 2020-05-30 00:59:29 -07:00
Ghommie
a7934f3f88 event. 2020-05-29 18:58:34 +02:00
Ghommie
e51ac4e745 Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event. 2020-05-29 17:58:35 +02:00
Ghom
ab5d65a454 Porting the BEPIS research machinery. (#12277)
* Initial B.E.P.I.S port.

* All nodes but sticky tape are in. Sweet.

* Mapping the BEPIS :DDD

* ah

* deers.
2020-05-24 13:05:15 -07:00
Ghom
9d2399ce9f Removing unused files and fixing some stuff. (#12250) 2020-05-15 07:15:15 -07:00
Trilbyspaceclone
f0cf2f8cfa Ports commit "fixes space vines" by AnturK (#12254)
* Update spacevine.dm

* Update spacevine.dm
2020-05-14 15:07:32 +02:00
Ghommie
7fb96ab0cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-05-12 20:06:59 +02:00
Ghommie
2858ddd90b Porting "Refactors language holder" 2020-05-08 22:44:02 +02: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
87858e8f60 Update sentience.dm (#12101) 2020-05-04 04:59:04 +02:00
Ghommie
a194d7dafe merge conflict and job/dept discounts support. 2020-05-03 02:11:05 +02:00
BlackMajor
d0a3b86d7b Fix wormholes event flinging people into asteroids. (#11946)
* Update wormholes.dm

* Update code/modules/events/wormholes.dm

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

* Update code/modules/events/wormholes.dm

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

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-05-01 18:27:39 +02:00
Ghommie
94f014589d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-25 17:09:34 +02:00
TrilbySpaceClone
7761990919 soooo this complies but does it work? 2020-04-23 03:13:07 -04:00
TrilbySpaceClone
86abfefa1b still dosnt work 2020-04-23 02:52:07 -04:00
Trilbyspaceclone
f1a5ba0754 wew 2020-04-23 02:28:16 -04:00
Trilbyspaceclone
b0e8c90531 Update spacevine.dm 2020-04-23 02:19:04 -04:00
Ghommie
42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
Ghommie
4c6f1b622b Porting Goofconomy & co. 2020-04-17 07:48:11 +02:00
kevinz000
956c2a57bf Merge pull request #11729 from Ghommie/Ghommie-cit666
Ports the VV Refactor by Kevinz.
2020-04-04 19:19:25 -07:00
kevinz000
413ded02c0 Merge pull request #11433 from Ghommie/Ghommie-cit616
Spellcasting element
2020-04-03 16:31:10 -07:00
Ghommie
9d97f1acda Ports the VV Refactor by Kevinz. 2020-04-03 19:16:43 +02:00
Putnam3145
658701bf37 Various ghost role QoL; moving holding facility; removing energy net (#11676)
* Removed gay baby jail net from ninja

* Made a proper holding facility for syndicate contractors

* Made ghost role eligibility able to allow reghosting.

* Added a medibot to the holding facility.

* Added new comsigs to every other ghost proc

* Properly dummied out capture objective
2020-03-31 22:04:55 +02:00
Ghommie
41e2c60d4a Ports "Makes raw HTML and browser datum popups UTF-8 aware" 2020-03-27 22:52:43 +01:00
Putnam3145
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
Putnam3145
368d47aa69 Adds ghost role eligibility to various ghost roles. (#11549)
* Added ghost role eligibility to CTF, possession, random animal

* Also added possessed blade to it.

* Also removed some extraneous dead/observer things.

* ahaha whoops
2020-03-22 13:02:23 +01:00
Ghommie
2045fb86f6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit616 2020-03-21 21:41:34 +01:00
Putnam3145
6fffb4045b Make mass hallucination more admemeable (#11491)
* Make mass hallucination more admemeable

* makes it work

* Update code/modules/events/mass_hallucination.dm

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

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-20 16:08:11 +01:00
Ghom
6e9aff97ae b 2020-03-19 01:44:28 +01:00
Ghommie
3aa3ed189a gunz 2020-03-18 23:53:10 +01:00
Ghommie
0285b4cee4 > virtual gf 2020-03-18 23:49:19 +01:00
Ghommie
ea30b2fb1a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit616 2020-03-15 22:35:59 +01:00
Ghom
9e3a3dddfd Merge pull request #11429 from Putnam3145/dynamic-tweaks
Dynamic tweaks/fixes
2020-03-12 14:20:28 +01:00
kevinz000
69c21f4b76 Merge pull request #10327 from Seris02/tggenetics
ports tg genetics
2020-03-11 17:01:37 -07:00
Ghommie
d31075eb54 Spellcasting element 2020-03-11 16:23:30 +01:00