Commit Graph
25643 Commits
Author SHA1 Message Date
Putnam 6d8f2b8914 Made s?laughter demon and apprentice cost threat, too. 2019-11-14 06:42:13 -08:00
Putnam 28a14fd01e Removed janky nuke disk threat increase 2019-11-14 05:57:56 -08:00
Putnam 3a6dce54ac i'm like 90% sure this is what it's supposed to be. 2019-11-14 05:53:58 -08:00
Putnam 304ce37d6c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic 2019-11-14 02:23:48 -08:00
CitadelStationBot 3d8ebe4219 Automatic changelog generation for PR #9775 [ci skip] 2019-11-14 02:40:19 -06:00
kevinz000andGitHub 487f98bf68 Merge pull request #9775 from Ghommie/Ghommie-cit340
ports "Adds superlube to the clown ruin", "Replaces the slime extract in the clown biodome with a superlube sprayer." and buffs clown PDAs
2019-11-14 01:40:16 -07:00
CitadelStationBot 106753c069 Automatic changelog generation for PR #9791 [ci skip] 2019-11-14 02:39:24 -06:00
kevinz000andGitHub f1612f6619 Merge pull request #9791 from kappa-sama/revolverports
ports TG's nicer revolver sprites for russian revolvers, normal .357 revolvers, and golden .357
2019-11-14 01:39:21 -07:00
kevinz000andGitHub e70a76085c Merge pull request #9789 from PersianXerxes/fixReagentDescriptions
Corrects the descriptions of meth and ephedrine
2019-11-14 01:38:01 -07:00
CitadelStationBot 3e4d6cb30c Automatic changelog generation for PR #9764 [ci skip] 2019-11-14 02:37:44 -06:00
kevinz000andGitHub 3015ec5c04 Merge pull request #9764 from Ghommie/Ghommie-cit335
Dreamchecker compatibility changes, part 1.
2019-11-14 01:37:41 -07:00
BlackMajorandGitHub 30a6df88c6 Merge pull request #9807 from BlackMajor/Yeehaw
Fixes Nuclear Operatives being scared to death. (Removes halloween.dm. No more locker ghosts)
2019-11-14 20:58:51 +13:00
BlackMajor af9c6279bc Fucking locker ghosts 2019-11-14 19:03:34 +13:00
BlackMajorandGitHub f4861ae808 Merge pull request #25 from Citadel-Station-13/master
synch time
2019-11-14 17:25:35 +13:00
Putnam ad84b2977a this might help with the disk weirdness 2019-11-13 19:14:42 -08:00
Putnam c08c6f5bb7 Made roundstart 2019-11-13 19:13:16 -08:00
Putnam e88a6f2571 why is this HERE 2019-11-13 19:12:06 -08:00
Putnam 5e51cc63f9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic 2019-11-13 16:58:44 -08:00
kappa-samaandGitHub 6ad9c7fef0 no shotgun i guess
shit guess i gotta add this to traumas too
2019-11-13 17:01:30 -05:00
kappa-samaandGitHub 17d8998fef emergent gameplay 2019-11-13 16:58:51 -05:00
kappa-sama 26281fbc57 bye bye modcit 2019-11-13 16:56:23 -05:00
kappa-samaandGitHub c9c7d3e64e begone 2019-11-13 16:46:13 -05:00
Putnam 8a02c1a0a1 Made results of vote semi-public 2019-11-13 04:30:45 -08:00
Putnam 0c3a7d4015 holy shit 2019-11-13 03:49:22 -08:00
Putnam bbcf91f88c blacklisted blob from clock cult, latejoin revs now higher req threat 2019-11-12 23:02:59 -08:00
kevinz000andGitHub 4e3147b228 Merge pull request #9755 from Ghommie/Ghommie-cit331
lentext to length, yet another 513 requirement.
2019-11-12 23:59:31 -07:00
CitadelStationBot aa7d037769 Automatic changelog generation for PR #9771 [ci skip] 2019-11-13 00:58:49 -06:00
kevinz000andGitHub 18993c735a Merge pull request #9771 from Ghommie/Ghommie-cit338
Porting Robustin's Syndicate Infiltrator PR from tee-gee
2019-11-12 23:58:46 -07:00
CitadelStationBot 8a7393cbe4 Automatic changelog generation for PR #9773 [ci skip] 2019-11-13 00:58:18 -06:00
kevinz000andGitHub e142ed03dd Merge pull request #9773 from Ghommie/Ghommie-cit339
Adding a new PDA reskin, sprites from CEV-Eris (plus bits from Beestation and Cit-RP)
2019-11-12 23:58:15 -07:00
CitadelStationBot a12f38d2ef Automatic changelog generation for PR #9765 [ci skip] 2019-11-13 00:57:41 -06:00
kevinz000andGitHub 8920930679 Merge pull request #9765 from dapnee/let's-fix-lockers
Ports Closet & Crate Initialization Fixes
2019-11-12 23:57:39 -07:00
CitadelStationBot 5e38fd4465 Automatic changelog generation for PR #9772 [ci skip] 2019-11-13 00:56:04 -06:00
kevinz000andGitHub a16219d97a Merge pull request #9772 from DeltaFire15/weh
Adds eight new plushies to the game while integrating kevs' plush PR
2019-11-12 23:56:01 -07:00
CitadelStationBot f520bdef5c Automatic changelog generation for PR #9779 [ci skip] 2019-11-13 00:52:04 -06:00
kevinz000andGitHub 2325cf1547 Merge pull request #9779 from Ghommie/Ghommie-cit341
A few clock cult improvements.
2019-11-12 23:51:58 -07:00
Putnam 89c560c891 this is why static typing is good and should be used more 2019-11-12 17:36:12 -08:00
Putnam 7ea3b5e221 Increased event cooldown 2019-11-12 17:01:25 -08:00
Putnam 6a7453dede whoops forgot initialize cooldown 2019-11-12 16:48:46 -08:00
Putnam 7a7c410265 lowered admin spam 2019-11-12 16:48:37 -08:00
kappa-sama 1aa1d91b61 Update uplink_items.dm 2019-11-12 17:15:45 -05:00
kappa-sama f093024967 better guns 2019-11-12 17:04:36 -05:00
kappa-samaandGitHub da3164fc10 send
help
2019-11-12 16:48:28 -05:00
Ghommie 2b8b8882fb You are actually rifght, that's bad. 2019-11-12 15:49:20 +01:00
DeltaFire 4d4d495765 Hmm I wonder if anyone would notice if I smuggled another plush into this PR
What it says on the tin, got asked via dms to add another plush to my PR so here we go.
Char is Minty.
2019-11-12 15:32:06 +01:00
Putnam d381be7f07 more logging. 2019-11-12 05:30:08 -08:00
Putnam 82a17d8144 updated an error to actually be right 2019-11-12 03:02:32 -08:00
Putnam 42d94e6cae Rethink events (see desc)
Made events their own ruletype, made the duplicated-with-different-threats events are now one event with shared values that can scale theirselves up.

Also fixed **MIDROUND ANTAGS NOT WORKING AT ALL BECAUSE THEY WERE LOOKING FOR ENEMIES ONLY AMONG PLAYERS ELIGIBLE FOR THE ANTAG WTF**
2019-11-12 02:57:31 -08:00
Persi c784cab060 Corrects the descriptions of meth and ephedrine to reflect that their movespeed buffs were previously removed. 2019-11-12 05:37:30 -05:00
Ghommie a18bcd05d7 makes it compile. 2019-11-12 02:38:45 +01:00