shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,972 Commits 5 Branches 0 Tags
d6b1b7603761a2b6e3abb4b253fb6494de2dde0d
Commit Graph

6085 Commits

Author SHA1 Message Date
kevinz000
8f08e1017e Merge pull request #9688 from Ghommie/Ghommie-cit306 
Fixing gibspawner runtimes and improving them, how gruesome...
 2019-11-14 15:51:20 -07:00
kevinz000
d8e89b235f Merge pull request #9689 from Ghommie/Ghommie-cit307 
How many times I have encountered this sort of issue in the past and how much of a meme it was...
 2019-11-14 15:50:52 -07:00
kevinz000
af0962088c Merge pull request #9453 from Ghommie/Ghommie-cit226 
Mitigates the ghost roles/mid-round antag lock out for suicide/cryo. And related fixes.
 2019-11-14 15:47:18 -07:00
kevinz000
dfa2296758 Merge pull request #9430 from Ghommie/Ghommie-cit220 
Ports "Adds three new .38 ammo types", also lazily adding .357 AP
 2019-11-14 15:44:59 -07:00
Ghommie
98bc6d6c60 Ports "Ghosts can now see the AI's camera" and "Removes error message while shunting [fix]" 2019-11-14 23:33:37 +01:00
Ghommie
358db4f390 Dreamchecker compatibility changes, part 2. 2019-11-14 14:54:12 +01:00
Putnam
3a6dce54ac i'm like 90% sure this is what it's supposed to be. 2019-11-14 05:53:58 -08:00
Ghommie
322c90fab2 Mistake I have done when copypasting. 2019-11-14 13:32:57 +01: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
kevinz000
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
kevinz000
3015ec5c04 Merge pull request #9764 from Ghommie/Ghommie-cit335 
Dreamchecker compatibility changes, part 1.
 2019-11-14 01:37:41 -07:00
BlackMajor
0c33757b14 Fixes a few bugs 2019-11-14 18:54:57 +13:00
BlackMajor
ce94da9ed3 Merge branch 'master' into Yote 2019-11-14 17:37:57 +13:00
BlackMajor
b9a7685830 Adds dogborg catch for doggos and some 2019-11-14 17:14:14 +13: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
Ghommie
2c1740f56e #43012 and missing typepaths aaaa 2019-11-13 23:26:03 +01:00
Ghommie
aa441fba5d Ports Improved beach away mission. 2019-11-13 22:52:39 +01:00
Ghommie
3ce4ef8e27 f 2019-11-13 21:17:40 +01:00
Ghommie
cef72b93eb The files. 2019-11-13 20:35:21 +01:00
Ghommie
248586cfd7 Unmodularize bikehorns and holy weapons. 2019-11-13 20:28:19 +01:00
TrilbySpaceClone
ec57e28c17 Merge branch 'master' into Cargo_MKII 2019-11-13 08:00:24 -05: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
kevinz000
4e3147b228 Merge pull request #9755 from Ghommie/Ghommie-cit331 
lentext to length, yet another 513 requirement.
 2019-11-12 23:59:31 -07:00
kevinz000
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
kevinz000
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
kevinz000
8920930679 Merge pull request #9765 from dapnee/let's-fix-lockers 
Ports Closet & Crate Initialization Fixes
 2019-11-12 23:57:39 -07:00
kevinz000
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
Ghommie
b83f92be0e Unmodularize airlocks. 2019-11-13 06:50:35 +01:00
Ghommie
f55a602319 Unmodularize areas. 2019-11-13 06:13:18 +01: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
Ghommie
4ef1d64356 PR #47500, #47501, #47557, #47588. 2019-11-12 19:00:45 +01:00
Ghommie
c5a7c28a1b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281 2019-11-12 16:04:05 +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
Ghommie
aad2b5bcd5 Fixing Aux base camera/drone RCD actions. 2019-11-12 04:35:10 +01:00
Ghommie
a18bcd05d7 makes it compile. 2019-11-12 02:38:45 +01:00
Ghommie
0b7437359a Dynamic. 2019-11-12 01:57:33 +01:00
Ghommie
388a7579b9 A few minor clock cult improvements. 2019-11-12 01:49:36 +01:00
Hatterhat
8ca0029e76 fast bombs - 5 sec to 2 sec 2019-11-11 18:49:30 -06:00
Ghommie
19a511929d and "Replaces the slime extract in the clown biodome with a superlube sprayer." 2019-11-11 23:39:03 +01:00
Ghommie
e50c56150e ports "Adds superlube to the clown ruin" and buffs clown PDAs 2019-11-11 23:10:22 +01:00
Ghommie
d06b6fd83e Adding a new PDA reskin, sprites from CEV-Eris (plus bits from Beestation and Cit-RP) 2019-11-11 21:34:47 +01:00