Commit Graph

1193 Commits

Author SHA1 Message Date
SuperSlayer
3b079fb46a Update creep_awakening.dm (#14785) 2022-07-16 15:59:09 +01:00
Redmoogle
0110136a0a Radstorms will trigger emergency maintaince with no living heads or AIs (#14760)
* Rad Maints

* Update radiation_storm.dm

* ok

* Update radiation_storm.dm
2022-07-16 12:58:06 +02:00
Mqiib
155bf9561d PLEASE WORK (#14725)
please work
2022-07-09 10:58:57 -04:00
Redmoogle
0c801129d1 Makes Radiation Storm Event more dangerous (#14658)
* Make Radiation storms way more spicy

* 25 Seconds
2022-07-09 14:05:22 +01:00
Redmoogle
1108dfe32b Adds new cargo loan event: PETA (#14562)
* PETA

* Vibe check
2022-06-26 14:27:37 +01:00
YouCanBeBetterThanThat
3c781cdd6e Reduce vent lag (#14044)
* Reduce vent lag

* tydftt

* Update code/game/objects/effects/effect_system/effects_foam.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/game/objects/effects/effect_system/effects_foam.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/game/objects/effects/effect_system/effects_foam.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
2022-06-06 15:59:04 +00:00
Jamie D
38b72860b3 Nope (#14334) 2022-06-06 17:57:01 +02:00
Byemoh
12af6495a1 removes monster hunter event from dynamic (#14281) 2022-06-04 16:09:44 +01:00
Sniblet
79f4954ae8 Monster hunters are no longer a guaranteed spawn on all bloodsucker rounds what (#14230)
* Update monsterhunter.dm

* both events are 7 weight

and bloodsucker hunter doesn't happen on dynamic, regular hunter will cover that

* Update code/modules/events/monsterhunter.dm

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2022-06-04 16:08:47 +01:00
TheGamerdk
10380e42e1 Midround alien larvas start the game already in a vent (#14267)
* Update teleport.dm

* Xenomorphs start the game already in a vent (#59567)

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

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

Co-authored-by: Arkatos1 <43862960+Arkatos1@users.noreply.github.com>
2022-05-30 21:35:49 +01:00
ynot01
a94aa9a6f4 round actually ends on narsie & time defines (#14207)
* round actually ends on narsie

* time defines

* time defines
2022-05-28 22:56:57 +01:00
Byemoh
0f0386c781 Update tzimisce.dm (#14252) 2022-05-27 20:56:50 +02:00
Theos
c4e24a155e Fixes a bunch of stuff because testmerges are for pussies (#14187)
* for fucks sake this is why we testmerge shit

* Update flowers.dm

* Update nettle.dm

* Update cigs_lighters.dm

* Update theft_tools.dm

* Update flashlight.dm

* Update items.dm

* Update supermatter_delaminator.dm

* Update spacevine.dm
2022-05-19 22:47:18 -04:00
Jamie D
73455667d8 Revert "Blacklists secondary datacore from various random events and re-adds the airlock (#14149)" (#14155)
This reverts commit 1cbc31c322.
2022-05-16 21:28:42 +01:00
Maxim
1cbc31c322 Blacklists secondary datacore from various random events and re-adds the airlock (#14149)
* kermit

* Revert "kermit"

This reverts commit c44c865773.

* e
2022-05-16 21:19:10 +01:00
tattax
de92f00679 bloodsucker fixes (#14126)
* thing

* s

* 0

Co-authored-by: Byemoh <baiomurang@gmail.com>

* d

* s

* d

Co-authored-by: Byemoh <baiomurang@gmail.com>
2022-05-16 21:15:19 +01:00
tattax
7cc7105157 damage flags are now defined from tg (#14050)
* 1st

* s

* d

Co-authored-by: Theos <theubernyan@gmail.com>
2022-05-16 20:14:12 +01:00
tattax
322a16abe8 fixes sinful demon arrival (#14127) 2022-05-14 16:31:54 -05:00
Jamie D
9cd00f425d Updates times (#14052) 2022-05-10 23:00:51 +01:00
tattax
d99c370533 Bloodsucker fixes + balance + new clan + ports some stuff (#13918)
* t

* woop

* forgot to undo this

* finishes tasks

* s

* d

* adds demo midround tzimisce clan and rebalances stuff

i'll update the pr later

* l

* adds bs into rotation

* .

Co-authored-by: Theos <theubernyan@gmail.com>

* try

* Update code/modules/events/tzimisce.dm

* adds a new message for info

clears up https://github.com/yogstation13/Yogstation/issues/13987

* does the thing uh huh

fixes the issue of the heartbeat @Sniblet

* aaggh

* f

* fixes runtimes

runtimes stopped frenzy from applying the burn effect ( i didn't even know about it cause it doesn't say it anywhre lol) + masquerade runtimes + gangrel runtimes which fucked everything and coffin runtimes (coffins have had 0 armor for some time)

* d

* a

* Apply suggestions from code review

Co-authored-by: Theos <theubernyan@gmail.com>
Co-authored-by: Byemoh <baiomurang@gmail.com>
Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2022-05-10 22:07:47 +01:00
TheGamerdk
4d366ccb6b fixes jamie breaking blob (#14075)
* Update overmind.dm

* Update transform_procs.dm

* Update blob.dm
2022-05-09 03:27:14 -04:00
Byemoh
6b8c821c1c fixes regal rats making minor mapping take 140+ seconds and breaking the stat panel until right when the round starts (#13899)
* what de fuck!

* fixes
2022-04-26 03:18:38 -04:00
Jamie D
58d7d21894 SHOULD Fix Admin Spawn Blob Resource Rate (#13833)
* Fixes Blob Resource Rate

* Fixes a dumb

* Update code/modules/events/blob.dm

right..

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>
2022-04-24 09:19:06 -04:00
Marmio64
f91974ae2a New midround antag: Demons of Sin (#13321)
* demon spells, objectives, more

* finish up gluttony

* Update code/modules/spells/spell_types/inflict_handler.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/events/sinfuldemon.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/antagonists/demon/sins/pride.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/antagonists/demon/sins/pride.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Some spelling fixes from hopek

Co-authored-by: Hopekz <hopekxx@gmail.com>

* Update code/modules/antagonists/demon/sins/gluttony.dm

Co-authored-by: Hopekz <hopekxx@gmail.com>

* is_helper and some documentation

* objective fixes

* greet sound, plus custom wrath and gluttony demon sprites

* demon spells, objectives, more

* finish up gluttony

* is_helper and some documentation

* Update code/modules/spells/spell_types/inflict_handler.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/events/sinfuldemon.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/antagonists/demon/sins/pride.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/antagonists/demon/sins/pride.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Some spelling fixes from hopek

Co-authored-by: Hopekz <hopekxx@gmail.com>

* Update code/modules/antagonists/demon/sins/gluttony.dm

Co-authored-by: Hopekz <hopekxx@gmail.com>

* objective fixes

* greet sound, plus custom wrath and gluttony demon sprites

* lesser daemon icons

* probably fixes the antag hud

* greed slot machine has a better chance of winning

i'll see if this is too powerful, but hopefully the greed demons are making people spend money to use it regardless. Anyhow, even if you do happen to win this while spending your maximum life, you aren't even guaranteed to get something good, and there is a 10% chance to flatout die, so i'd say a higher chance of winning is in order.

* hud

* hud round 2

* i dont know, another try

* destroys the merge conflicts for now

* centering

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
Co-authored-by: Hopekz <hopekxx@gmail.com>
2022-04-24 10:39:57 +01:00
adamsong
b0dec65c48 Gamma alert is no longer aurora alert (#13591)
* Gamma alert is no longer aurora alert

* Remove ion storm
2022-04-11 18:08:16 +01:00
Altoids1
ec310b03bf Yalp Elor no longer instantaneously dies on-spawn, plus other bugfixes (#13630)
* Probably fixes a bug with solo fugitives

Dreamchecker caught this for me while I was scanning through this code file :-)

* Fixes inaccurate Login() dialogue for Yalp Elor

Used to be that Login() would always say you have ten minutes, even if you were reconnecting. It's fixed now :-)

Patches bad passed_time value

I am smelly

* Yalp Elor no longer spontaneously dies on-spawn

Also fixes fugitives which just happen to have crashed their game counting as "dead" for this loss condition check ;-)

* Yalp Elor can no longer whisper slurs to you

Yet another call to stripped_input that doesn't bother to do a pretty filter call afterwards 😔

* Fixes bad Destroy() overwrite for Yalp Elor

SSobj is going to enjoy not having to call process() on null values as much.
2022-04-10 13:25:04 +01:00
tattax
74147777a8 Ports Bloodsuckers and Monster Hunters from Fulpstation (#13273)
* bs and mh

above

* updoot

d

* fix 2

* updoot 3

* updoot 4

* updoot 5

* quick psosible fix

* updoot 6

* quick fix 2

* pr updoot (probably)

* updoot 7

* possible maybable fix

* second maybable possible fix

* should work for checks

* updoot 8

* attempt 2

* mindslave hud

* reupdates hud.dmi

* quickfix 1

* hotfix 2

* quickfix 3

* quickfix 5

* quickfix 4

* quick fix 6

* clean 1

* quickfix 7

* quickfix 8

* turns all clans flavor only

* code improvement + fixes

* things i forgot

* Revert yarn

* fix to huds

* quickfix 9

* quickfix 10

* quickfix 11

* quick fix 12 (the lugening)

* fuck

Co-authored-by: Theos <theubernyan@gmail.com>

* d

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>

* p

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>

* saves yogstation

* penis

* why can't we have nice things

* quickfix 13

* ssssssssss

* hell

* summon traps

* this probably is a good idea

* heolp

* merge master into poggy

* Revert "merge master into poggy"

This reverts commit c346759195.

* amogus

* possibly fixes the gamemode idk it compiles

* makes stuff not cringe

* i hate webeditor

* i hate webeditor

* i hate webeditor

* fixessss

* ducky

* 2

* o

Co-authored-by: adamsong <adamsong@users.noreply.github.com>

Co-authored-by: Byemoh <baiomurang@gmail.com>
Co-authored-by: JohnFulpWillard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Theos <theubernyan@gmail.com>
Co-authored-by: adamsong <adamsong@users.noreply.github.com>
2022-04-10 12:28:02 +01:00
adamsong
b741e1becc Ticks chem_spill.dm and changes the title of the message for chem spill that no one has seen because its been unticked (#13613)
* Did a dumb

* More dumb
2022-04-06 01:24:47 -05:00
adamsong
b8ec8ae09c Adds chem spill event (#13592)
* Adds chem spill event

* Tweaks numbers
2022-04-06 01:01:34 -04:00
adamsong
818ab4d2d2 VV works again (#13491)
* VV works again

* Fix some more I missed
2022-03-23 16:51:30 -05:00
Moja10
032cc3463f [admin] Doubles Admin Event Cancellation Time (#13456)
* Doubles event time 

Its too hard to click on event cancellation prompt when admin logs are spamming at the speed of sound. I have missed event cancellations because I want to cancel it, but I don't make it on time. Or that I didn't realize because I had the audacity to look away or type for 5 seconds, and then only have a 5 second window to cancel. Doubles the event cancellation timer which doesn't really affect anything on the player's side, just lets admins more easily ward off events that really don't need to be spawned.

* Update code/modules/events/_event.dm

* Update _event.dm

* Update code/modules/events/_event.dm

* made SPOOKY RED

* FORGOR

* Demote Bibby

* Bibby blights me

cuts accidental 200 seconds to seconds

* Admin Text is correct time

* Update code/modules/events/_event.dm

Co-authored-by: Lucy <lucy@absolucy.moe>

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
Co-authored-by: adamsong <adamsong@users.noreply.github.com>
Co-authored-by: Lucy <lucy@absolucy.moe>
2022-03-19 13:51:42 +00:00
adamsong
e5a1515de1 Refactors VV (#13312)
* Refactors VV

* Copied more tg code

* Fixes renameing by copying more tg code

* Copies some code from yogs this time
2022-03-13 11:22:11 +00:00
adamsong
d2af85bea0 Hopefully fixes the horror bug (#13406) 2022-03-10 18:53:05 +00:00
MenacingManatee
5fae00f93f Ion lawset expansion (#13249)
* merge into main

* Revert "merge into main"

This reverts commit b6aa002a82.

* Creates a second set of weights for ion laws

* Alerts the user if full lawset is changed
2022-02-22 00:22:45 +00:00
ChesterTheCheesy
4d369ae1db Eldritch horror - the final PR (#13033)
* Update is_helpers.dm

* Update role_preferences.dm

* Update traits.dm

* Update names.dm

* Update traumas.dm

* Update miscellaneous.dm

* Update scanners.dm

* Update sql_ban_system.dm

* Add files via upload

* Update headcrab.dm

* Update panacea.dm

* Create e

* Delete e

* adds horror

* Add files via upload

* Update suicide.dm

* Add files via upload

* Update brain_item.dm

* Update death.dm

* Update human.dm

* Update transform_procs.dm

* Update gun.dm

* Update organ_manipulation.dm

* Update uplink_items.dm

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Create horror.txt

* Add files via upload

* Update yogstation.dme

* adds horror-relatated tips

* fixes a typo

* Update code/_onclick/hud/horror.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/game/objects/effects/temporary_visuals/miscellaneous.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/game/objects/effects/temporary_visuals/miscellaneous.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/antagonists/horror/horror.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/antagonists/horror/horror.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/antagonists/horror/horror.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/antagonists/horror/horror.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/antagonists/horror/horror.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/antagonists/horror/horror.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/antagonists/horror/horror.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update scanners.dm

* Update code/modules/antagonists/changeling/powers/headcrab.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* i hope this won't break again

* actually makes horror unable to force lings to suicide

* fixes duplicate definition

* Not needed, changeling code already checks for that

* Cleans up a lot of code

* thank you theos for absolutely nerfing the crap out of horror tentacle

* cleans up a lot of bibby's suggestions and fixes a few bugs

* not sure if i changed anything in this file, but fuck it

* lets fix that merge conflict

* i sure hope github doesn't go nuclear

* oops made horror unable to work

* i hate logic gates

* sorry for commit spam but this thing literally broke horror and i wanna fix it as soon as possibles

* HAHA STUPID DE MORGAN! (tested works as intended)

* abominations summoned by curator horn should not attack horror anymore

* adds missing "

* cannot use lube ability whilst dead anymore

* Update horror_abilities_and_upgrades.dm

* flailing lube stops when you're killed while doing it

* fixes ordering so you can't get stuck in wrong animation at the last spin

* Horror can no longer squeeze through welded airlocks

* Infesting people is now assigned to Alt+Click

* makes tentacle arm no longer affected by range multipliers

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
2022-02-02 18:44:08 +00:00
adamsong
ea3e7c7999 [s] Fix security exploit, oppresses AOs (#12679)
* Fix security exploit, oppresses AOs

* Properly oppresses AOs
2021-11-18 20:12:28 +01:00
cuackles
f6df13f189 Inhand trick or treat bag sprite, just a bit late for Halloween (#12587)
* aaaaaaaaaa

* Update halloween.dm
2021-11-08 18:23:19 -06:00
Xoxeyos
531421f50f Update flutes.dm (#12429) 2021-10-10 18:05:54 -04:00
Theos
c57fa5a879 Kills off price elasticity and buffs several exports because I hate balance (#12288)
* switches phazons from a bounty to an export so they can be sold more easily
adds an export limit variable that limits the number of times something can be exported
removes price elasticity
adds a couple new exports
buffs several exports because lol

* silver bit and failure to compiwe

* Update organs.dm

* fixing merge conflicts is an art

* reduce human skin 2000 > 1000 since it's easy to get

* Update sheets.dm

* nerfs organ prices so monkey spam can't get infinite cash

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2021-09-17 12:58:33 +01:00
adamsong
3baeaeb0c4 Steals tg's span macros (#12232)
* Steals tg's span macros

* Fix alphabet

* Updated some more spans

* Misses a conflict

* Fix compile errors

* Converts more spans

* oops
2021-09-17 12:50:16 +01:00
adamsong
01d39d43d9 Makes station threats trigger gamma alert (#12134)
* Makes clock cult bloodstones trigger gamma alert

* Adds more causes of gamma alert

* Should work better now
2021-08-25 19:28:43 -04:00
TheGamerdk
e4d52e1500 Update aurora_caelus.dm (#12095) 2021-08-24 10:40:36 +01:00
adamsong
ac6dfcb01d Makes event spawning based on alert level (#12071)
* Makes event spawning based on alert level

* Adds a minimum alert as well
2021-08-24 09:49:20 +01:00
Jamie D
c2754e8741 Update vent_clog.dm (#12050) 2021-08-17 19:02:20 -04:00
adamsong
5063682233 Makes brand intelligence explosion not space rooms (#11939) 2021-08-06 20:19:57 +02:00
TheGamerdk
82437d369d Update _event.dm (#11930) 2021-07-31 11:32:33 -04:00
TheGamerdk
c5480744e4 Supermatter surge now asks for severity + should we announce when admin triggered (#11822)
* Update supermatter_surge.dm

* Update code/modules/events/supermatter_surge.dm

Co-authored-by: adamsong <adamsong@users.noreply.github.com>

* Update code/modules/events/supermatter_surge.dm

* Update code/modules/events/supermatter_surge.dm

Co-authored-by: adamsong <adamsong@users.noreply.github.com>
2021-07-29 22:52:10 -04:00
adamsong
d6d199741a Fixes shitcode using hardcoded zlevel numbers (#11831) 2021-07-20 18:35:53 -04:00
Xoxeyos
4374b935ce Dynamic 2021 & Ghost Pool Protection (#11139)
* Please let this work

Good luck to myself, Xoxeyos

* This shit is fucking abhorrent

Admin.dm, rust_g, game.dm, mobs.dm, pai.dm, dynamic folder, holy_weapons.dm, admin_verbs.dm, topic.dm, ghost_pool_protection, antag_datum.dm, CTF.dm, corpse.dm, _event.dm, living/brain/posibrain.dm, giant_spider.dm, dynamic.json

* Why is this here?

* Update dynamic_rulesets_roundstart.dm

* Merges Dynamic 2021 final fixes

* Will this work?

* Maybe this might work.

* This was suggested as a change.

* Fixes bad bugs

* Easy enough.

* Update ghost_pool_protection.dm

* Update ghost_pool_protection.dm

* Update dynamic.dm

* Update dynamic.dm

* Update dynamic_rulesets_latejoin.dm

* Update dynamic_rulesets_latejoin.dm

* Update dynamic.dm

* Update dynamic_rulesets_roundstart.dm

* I can put in sound_enviroment when I figure out what it is

* Update mob_defines.dm

* Update mob_defines.dm

* Update mob_defines.dm

* Security and Command personnel rolled infiltrator again

* Update dynamic.dm

* Ports over https://github.com/tgstation/tgstation/pull/58644 - No more mass infiltrations?

This is an attempt to keep infiltrators from spawning in nonstop.

* Update ruleset_picking.dm

* Update dynamic_rulesets_latejoin.dm

* Update dynamic_rulesets_roundstart.dm

* Update dynamic_rulesets_roundstart.dm

* weight configurement

* weight configurement

* Update dynamic_rulesets_roundstart.dm

* Update dynamic_rulesets_latejoin.dm

* Update dynamic_rulesets_roundstart.dm

* Update dynamic_rulesets.dm

* Update dynamic.dm

* Update dynamic_rulesets_latejoin.dm

* Update dynamic_rulesets_roundstart.dm

* Update dynamic_rulesets_roundstart.dm

* Update dynamic_rulesets.dm

* Update new_player.dm

* Update dynamic_rulesets_roundstart.dm

* Update dynamic_rulesets_midround.dm

* Update dynamic_rulesets_latejoin.dm

* Update dynamic_rulesets_midround.dm

* Update dynamic_rulesets_roundstart.dm

* Update dynamic_rulesets_roundstart.dm

* Update dynamic_rulesets_latejoin.dm

* Update dynamic_rulesets_roundstart.dm

* Adds from logging from https://github.com/tgstation/tgstation/pull/58451/

* Finishes up adding https://github.com/tgstation/tgstation/pull/58451/

* Update dynamic_rulesets_midround.dm

* Update dynamic_rulesets_midround.dm

Co-authored-by: Redmoogle <dakotamew@gmail.com>
Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2021-07-09 10:49:41 +01:00
adamsong
86a120ec4d Makes the shuttle catastrophe only happen if the shuttle is on the CC z-level (#11660) 2021-06-29 22:13:18 -04:00