81 Commits

Author SHA1 Message Date
evilew d80bb00853 event tweaks 2024-11-17 22:56:20 +01:00
evilew e073063399 tweaking event balance
- nerfed most disruptive events from happening, raising pop requirement
- stopped radstorms and heart attacks from occuring
- slightly buffed lighter or less destructive events
2024-10-13 14:53:10 +02:00
SandPoot c07e94be66 push 2024-08-24 21:28:55 -03:00
SandPoot 676cb864b1 missed proc refs 2024-03-12 22:17:30 -03:00
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 54641ce201 send 2023-01-23 20:44:28 -03:00
shellspeed1 44536ad7ab Fixes a runtime which bricked the pad plus fixing sprites. Also ports https://github.com/tgstation/tgstation/pull/55533 credit to cacogen. 2022-09-20 16:57:49 -07:00
shellspeed1 40dc7d57c3 port of https://github.com/tgstation/tgstation/pull/55762, credit to ArcaneMusic. 2022-09-18 22:40:07 -07:00
shellspeed1 aa7252ffd6 port of https://github.com/Skyrat-SS13/Skyrat-tg/commit/418c58a9c3c8b78c0577e150ad891aba8d7a7731 to make pad deconstructible. 2022-09-18 22:13:44 -07:00
Putnam3145 0a31d4cf12 Made some events still show messages with intern 2022-08-29 03:06:21 -07:00
Putnam3145 e1c822cbd8 TGUI; actually fixes station announcer 2022-08-07 17:17:58 -07:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
Letter N bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot 13d7a166fe Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-27 13:54:49 -03:00
SandPoot 829ca8b9a7 Merge branch 'master' into tgui-alerts-and-what-not 2021-10-11 20:41:56 -03:00
keronshb 1c754b814e Pirates pay raise documented 2021-10-09 00:47:16 -04:00
SandPoot 437b3105d1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-08 21:05:41 -03:00
DeltaFire c5476daeec revert 2021-10-08 23:51:34 +02:00
SandPoot bbe32fa38a Upload files 2021-10-05 00:33:49 -03:00
keronshb 3bda0e9015 Pirate fix 2021-09-26 21:00:48 -04:00
keronshb a6bfff92cc Fixes pirates, re adds extended, re adds voting 2021-09-24 19:40:56 -04:00
keronshb cd00d1589e fucking hell 2021-09-19 18:06:24 -04:00
keronshb 0b5a7c9759 OOPS FORGOT PIRATES and some blacklists 2021-09-19 17:56:26 -04:00
keronshb 518c54c061 Adds the correct hijack 2021-09-16 15:52:53 -04:00
keronshb f2b7dba990 More fixes? 2021-09-15 18:52:24 -04:00
zerothebigboy 90930494d6 k 2021-05-05 18:43:11 -04:00
zerothebigboy c8ebe720ec k 2021-05-05 18:25:05 -04:00
zerothebigboy 5138d86655 skylarlineman'safurry 2021-05-05 03:35:25 -04:00
Lin f3ea2d58dc Merge pull request #14602 from BlueWildrose/YoHoYoHofuckoff
Pirate related fixes and communication console fixes
2021-04-14 21:39:06 -05:00
Hatterhat 32bbbecc39 pirate payoff minimum from 20k to 1k (#14581)
* removes 20k minimum on pirate payoff

* Update pirates.dm
2021-04-13 15:13:53 +02:00
Blue Wildrose 8b47786556 Pirate stuff and comm console fixes 2021-04-13 00:53:55 -07:00
LetterN 74c00d17f8 let's be [redacted], its really in t his year 2021-03-31 09:43:15 +08:00
SandPoot 123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
2021-02-18 15:04:46 -03:00
SandPoot cf2e70671a upload files 2021-02-18 14:47:10 -03:00
DeltaFire15 91584053f5 Fixes a bunch of fallout from the tgui PR (#13648)
* screamies

fixes a bunch of fallout from the tgui PR.. probably

* Empty commit to poke travis
2020-11-01 21:59:22 +01:00
Timothy Teakettle f1cd94fc97 emp rework 2020-09-09 23:14:06 +01:00
Putnam 4ef4220c88 Completely decouples events from dynamic. 2020-09-03 16:38:16 -07:00
Hatterhat 0c4a3c740d >metabreaks >2020 2020-08-18 21:50:57 -05:00
Letter N a19e306137 less redtext - updates anomalies 2020-08-03 20:53:36 +08:00
Letter N 5d4bb48628 another batch. MAJOR: ccpodlauncher, cargo/console.dm, smartfrige, holodeck/computer.dm, biogenerator 2020-07-29 15:10:01 +08:00
Artur 20245f7319 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-30 02:30:29 +03:00
Ghommie e51ac4e745 Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event. 2020-05-29 17:58:35 +02:00
Artur 9d04b0835b Conflicts galore 2020-05-21 21:08:12 +03:00
Ghom 9d2399ce9f Removing unused files and fixing some stuff. (#12250) 2020-05-15 07:15:15 -07:00
Artur dabdf16eac Coonflict fiiixeeess 2020-05-13 12:56:17 +03:00
Artur 5b7d9a9008 Merge conflict fix 2020-05-13 12:37:18 +03: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