Commit Graph

1168 Commits

Author SHA1 Message Date
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
wejengin2
50e0741008 Makes the SM surge event even more powerful (#11464)
* spicy

* spicier

* always announce
2021-06-13 11:20:17 +01:00
Mqiib
9884c8c5a4 BYOShuttle Catastrophe Fix (#11449)
* When you forget to hit button

* Big and small!
2021-05-08 10:30:06 -04:00
swissloaf
51fbb4059c Adds station traits: Small modifiers that can randomly be chosen each round (#11134)
* Station Traits

* Update positive_traits.dm

* Test

* Revert "Test"

This reverts commit c99e3e9db5.

* Update sound.dm

* Update code/datums/station_traits/positive_traits.dm

Co-authored-by: Redmoogle <dakotamew@gmail.com>

* Update code/__HELPERS/priority_announce.dm

Co-authored-by: Redmoogle <dakotamew@gmail.com>

* Update ai_laws.dm

* Update traits.dm

* Update neutral_traits.dm

* Update negative_traits.dm

* Negative bot trait

* Update negative_traits.dm

* Adds an admin log hpoefully

* Update station.dm

* Update station.dm

* Update station.dm

* Update station.dm

* Update station.dm

* Update station.dm

* Update station.dm

* Removes custom alert message for now

* Update station.dm

* Update game_mode.dm

* Update extended.dm

* Update game_mode.dm

* Update dynamic.dm

* Update dynamic.dm

* Update extended.dm

* Update game_mode.dm

* Update dynamic.dm

* Update game_mode.dm

* Update dynamic.dm

* Update extended.dm

* Revert "Update extended.dm"

This reverts commit 2235319bb3.

* Revert "Update dynamic.dm"

This reverts commit 6af1fbaf60.

* Revert "Update game_mode.dm"

This reverts commit dd84d504dc.

* Try again

* Update game_mode.dm

* Let's test making them more common

* Medbot update

* Update negative_traits.dm

* Update negative_traits.dm

* tHNE great f

* Update traits.dm

* Update job.dm

* Update negative_traits.dm

Co-authored-by: Redmoogle <dakotamew@gmail.com>
2021-04-10 12:17:08 +01:00
Mqiib
7d98c423ed SHUTTLE_STRANDED!!! (#11280) 2021-04-05 03:30:06 -04:00
UselessTheremin
e89bc9d500 wah (#11224) 2021-03-29 20:12:15 -04:00
swissloaf
b0a8e490f4 Overhauls the "Department Revolt" admin-only event and modernizes it (#11109)
* Depoar

* fixes
2021-03-24 10:45:09 -04:00
ChesterTheCheesy
1075ea494a Fixes shuttle catastrophe event not happening (#11144)
* Update shuttle_catastrophe.dm

* hopefully works now
2021-03-16 13:16:31 +00:00
UselessTheremin
655c3f126e Adds the "Supermatter Surge" random event from cit (#11086)
* Create supermatter_surge.dm

* Update yogstation.dme
2021-03-12 09:32:18 +00:00
Redmoogle
e8d966aa99 Events prerun text is now much bigger and red and also increase cancel time to 20 seconds (#11076)
* Increase time and BIG text

* remove the big part
2021-03-12 09:28:15 +00:00
alao3alao3
a17a2744fd Changes Oak's Birthday to Gondola Day for some goddamn reason. (#10905)
* dont tell altoids

* removes the only references outside of the holiday file

* oak and swissloaf sitting in a tree

* beats me why they're upset about doing it in another PR

* damn, anyone else in bed with the finnish?
2021-01-23 11:43:13 +00:00
alao3alao3
8c832819e7 Adds a few more fluff text options to the Mice Migration announcement. (#10903) 2021-01-23 11:39:11 +00:00
Xoxeyos
b1a3882011 Update xmas.dm (#10708) 2020-12-23 18:50:08 +00:00
TheGamerdk
65e3fe7465 CDN Assets + TGChat + Statbrowser Restyle (#10211)
* asset cache cdn

* Fix cdn rsc (#52886)

I was converting this to use length so it didn't have to care if the list existed or not, and forgot to remove the .len. this broke cdn .rsc files because length(num) returns 0.

* Add warning about https to the external rsc config (#53367)

today in hostchat we discovered that most of the servers who tried to 
do cdn the .rsc, had unknown issues because they had used https:// 
urls. Byond can't into https.

like 5 servers had failed to get this to work because of that pitfall, 
so im gonna add a warning to the config.

* tchat

* tgchat compile

* fixes

* Merge pull request #53011 from stylemistake/tgui-chat-fix-asay

tgchat: Fix asay

* chat color

* logging

* webstorage

* compile TGUI

* actually like compiles on the DM side

* Update chat-dark.scss

* Update chat-light.scss

* Update resources.txt

* Update tgui-panel.bundle.css

* Colors

* compile

* s

* s

* Ports Gamers TGChat so we can edit it. - NOT LIVE TGCHAT BRANCH (#10226)

* asset cache cdn

* Fix cdn rsc (#52886)

I was converting this to use length so it didn't have to care if the list existed or not, and forgot to remove the .len. this broke cdn .rsc files because length(num) returns 0.

* Add warning about https to the external rsc config (#53367)

today in hostchat we discovered that most of the servers who tried to 
do cdn the .rsc, had unknown issues because they had used https:// 
urls. Byond can't into https.

like 5 servers had failed to get this to work because of that pitfall, 
so im gonna add a warning to the config.

* tchat

* tgchat compile

* fixes

* Merge pull request #53011 from stylemistake/tgui-chat-fix-asay

tgchat: Fix asay

* chat color

* logging

* webstorage

* compile TGUI

* actually like compiles on the DM side

* Update chat-dark.scss

* Update chat-light.scss

* Update resources.txt

* Update tgui-panel.bundle.css

* Colors

* compile

* s

* s

Co-authored-by: Kyle Spier-Swenson <kyleshome@gmail.com>
Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
Co-authored-by: skoglol <33292112+kriskog@users.noreply.github.com>
Co-authored-by: TheSmallBlue <ilanmori@hotmail.com>

* Fixes Replay Chat

* Update to_chat.dm

* Update chat.dm

* Update demo.dm

* yarn berry

* yarn berry compile

* Update resources.txt

* Update config/resources.txt

* Update resources.txt

* Attempt at fixing reconnect.

* Lets try fix it again

* oops

* THROW THE SINK AT IT

* ree

* Makes Travis work again thank you jamie

* Fixes snowflake images

* Update security.dm

* Updates TGChat Test Merge (#10307)

* asset cache cdn

* Fix cdn rsc (#52886)

I was converting this to use length so it didn't have to care if the list existed or not, and forgot to remove the .len. this broke cdn .rsc files because length(num) returns 0.

* Add warning about https to the external rsc config (#53367)

today in hostchat we discovered that most of the servers who tried to 
do cdn the .rsc, had unknown issues because they had used https:// 
urls. Byond can't into https.

like 5 servers had failed to get this to work because of that pitfall, 
so im gonna add a warning to the config.

* tchat

* tgchat compile

* fixes

* Merge pull request #53011 from stylemistake/tgui-chat-fix-asay

tgchat: Fix asay

* chat color

* logging

* webstorage

* compile TGUI

* actually like compiles on the DM side

* Update chat-dark.scss

* Update chat-light.scss

* Update resources.txt

* Update tgui-panel.bundle.css

* Colors

* compile

* s

* s

* Ports Gamers TGChat so we can edit it. - NOT LIVE TGCHAT BRANCH (#10226)

* asset cache cdn

* Fix cdn rsc (#52886)

I was converting this to use length so it didn't have to care if the list existed or not, and forgot to remove the .len. this broke cdn .rsc files because length(num) returns 0.

* Add warning about https to the external rsc config (#53367)

today in hostchat we discovered that most of the servers who tried to 
do cdn the .rsc, had unknown issues because they had used https:// 
urls. Byond can't into https.

like 5 servers had failed to get this to work because of that pitfall, 
so im gonna add a warning to the config.

* tchat

* tgchat compile

* fixes

* Merge pull request #53011 from stylemistake/tgui-chat-fix-asay

tgchat: Fix asay

* chat color

* logging

* webstorage

* compile TGUI

* actually like compiles on the DM side

* Update chat-dark.scss

* Update chat-light.scss

* Update resources.txt

* Update tgui-panel.bundle.css

* Colors

* compile

* s

* s

Co-authored-by: Kyle Spier-Swenson <kyleshome@gmail.com>
Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
Co-authored-by: skoglol <33292112+kriskog@users.noreply.github.com>
Co-authored-by: TheSmallBlue <ilanmori@hotmail.com>

* Fixes Replay Chat

* Update to_chat.dm

* Update chat.dm

* Update demo.dm

* yarn berry

* yarn berry compile

* Update resources.txt

* Update config/resources.txt

* Update resources.txt

* Attempt at fixing reconnect.

* Lets try fix it again

* oops

* THROW THE SINK AT IT

* ree

* Makes Travis work again thank you jamie

* Fixes snowflake images

* Update security.dm

Co-authored-by: Kyle Spier-Swenson <kyleshome@gmail.com>
Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
Co-authored-by: skoglol <33292112+kriskog@users.noreply.github.com>
Co-authored-by: TheSmallBlue <ilanmori@hotmail.com>
Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>

* Fixes

* Undo Kitchen Sink

* Fucking 7 Hours.

* status panel

* stat panel fixes

* fixes

* stat panel stuff

* Stat panel finish

* Compile, oops

* Update server_maint.dm

* Update world.dm

* Update interface.dm

* tgui compile

* Update subsystems.dm

* fix statpanel deleting whole admin tab (#54211)

fix: adminhelping no longer removes entire admin tab
fix: end of round no longer removes entire admin tab

* Update skin.dmf

* verbs?

Co-authored-by: Kyle Spier-Swenson <kyleshome@gmail.com>
Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
Co-authored-by: skoglol <33292112+kriskog@users.noreply.github.com>
Co-authored-by: TheSmallBlue <ilanmori@hotmail.com>
Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>
Co-authored-by: Couls <coul422@gmail.com>
Co-authored-by: Tad Hardesty <tad@platymuus.com>
Co-authored-by: Bobbahbrown <bobbahbrown@gmail.com>
2020-11-10 19:10:27 +00:00
Jamie D
b1ab3285de Fix (#10312) 2020-11-02 20:51:46 +00:00
Jamie D
0dd6fae119 [Port] Explosions Subsystem Test 1 (#10202)
* Explosions Subsystem Test 1

* Fucking linter

* Fucking TG Are Dents

* SCREW OFF LINTER
2020-10-28 17:54:13 +00:00
swissloaf
0a5d8a2696 Adds the Shuttle Catastrophe Event (#10182)
* w

* Update shuttle_catastrophe.dm

* Update shuttle_catastrophe.dm

* Update shuttle_catastrophe.dm
2020-10-27 09:39:02 +00:00
Jamie D
fb8eeb5a1f Tgui 4.0 - IN PROGRESS (#10116)
* Night 1

* Bit more

* MORE

* JS AND SHIT

* MORE

* IT COMPILES MOSTLY

* More and prepare for tgchat

* Woah there captain, TGUI 4.1 first.

* Shoo

* Copyshites

* Hmm

* Hmm

* Fixxxxx

* Fucking Apcs

* Fuck off autoupdate

* Rename DropDown.js to Dropdown.js

* Vending

* Few Fixes

* More Fixes

* Stand HO

* fixes sleepers without breaking anything else I think

* Oops

* Fixerinos

* Oopsie

* BUNDLE

Co-authored-by: Theos <theubernyan@gmail.com>
2020-10-25 18:34:06 +00:00
Marmio64
4c03e03bee sleepy virus (#10090)
should work, i tested it
2020-10-24 11:59:58 +01:00
boodaliboo
d5f4a43649 (kinda a port) adds snowmen (#10004)
* Create winter_mobs.dm

* Add files via upload

* Update winter_mobs.dm

* Create christmas.dm

* Delete christmas.dm

* Update xmas.dm

* Update yogstation.dme

* Update xmas.dm

* Update xmas.dm

* Update xmas.dm

* Update winter_mobs.dm

* Christ Bood, Come on.

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2020-10-24 09:09:35 +01:00
jcatjmeow
96797a9eaa Revert "Beware of Meaty Ores, for the Meatball Man comes" (#9883)
* Revert "Beware of Meaty Ores, for the Meatball Man comes (#9719)"

This reverts commit 1a9005a360.

* Update code/game/gamemodes/meteor/meteors.dm

* Update code/game/gamemodes/meteor/meteors.dm

* Update meteors.dm
2020-10-17 12:49:23 +01:00
fluffe9911
1a9005a360 Beware of Meaty Ores, for the Meatball Man comes (#9719)
* yes

* Update meteors.dm

* Update meateor_wave.dm

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2020-10-04 18:22:23 +01:00
AutisticFroggy
8cf7d3aac6 Funny music now plays when pirates spawn (#9535)
* Test

I hope this works

* Makes it impossible to meta fake announcement using the music

* forgot to take this one out

* does this work alexkar

* moves sound to server

* autodoc
2020-09-08 22:57:40 +01:00
alexkar598
40ca7cd5c0 Alexkar598 fixes PRs post merge - My review wasnt stale edition (#9591)
* Alexkar598 fixes PRs post merge - My review wasnt stale edition

* Update code/modules/events/flutes.dm

Co-authored-by: jcatjmeow <40673387+jcatjmeow@users.noreply.github.com>

Co-authored-by: jcatjmeow <40673387+jcatjmeow@users.noreply.github.com>
2020-08-31 03:58:25 -04:00
Xoxeyos
1696d277a0 Adds a new, extremely rare event. (#9166)
* Create flutes

* Update flutes

* Update flutes

* Update flutes

* Update flutes

* Adds flute sound effects for flute event

* Delete flutes

* readds flute.dm with the proper file

* Update flutes.dm

* Update flutes.dm

* Update flutes.dm

* Weight now one

* Delete flutes.ogg.ogg

* Fixes flutes.ogg I think

* Delete flutes.ogg.ogg

* fixes flutes.ogg

* Update flutes.dm

* Update code/modules/events/flutes.dm

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>

* Update code/modules/events/flutes.dm

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>

* Update code/modules/events/flutes.dm

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>

* Update code/modules/events/flutes.dm

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>

* Update code/modules/events/flutes.dm

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>

* Update code/modules/events/flutes.dm

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>

* Update code/modules/events/flutes.dm

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>

* A bonk on the head has less of a chance to kill you

* proper name

* Added a random blackout feature, which adds a new trait

* Fixed a merge conflict

Pulled both changes from my work and Xoxeyos's.

* Update flutes.dm

* Update code/modules/events/flutes.dm

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>

Co-authored-by: arcturus-prime <seanans135@gmail.com>
Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>
2020-08-29 12:31:47 -04:00
Nichlas Pihl
38b52d4436 You can now shoot pirates down with the BSA before they arrive at the station (#9337)
* pirates lmao

* I forgot I renamed this variable
2020-08-08 17:02:01 -04:00