cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,561 Commits 55 Branches 0 Tags
09e5cd95a3ee14443beab18823f05d4145a2c26f
Commit Graph

16184 Commits

Author SHA1 Message Date
kevinz000
09e5cd95a3 Merge pull request #9690 from Ghommie/Ghommie-cit308 
Unmodularize configuration, _globalvars and subsystems.
 2019-11-14 15:50:20 -07:00
kevinz000
617b0db310 Merge pull request #9692 from Ghommie/Ghommie-cit309 
Unmodularize cargo console, disposal bin, lighting bulbs/tubes and alien nest ruin.
 2019-11-14 15:48:34 -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
kevinz000
d1ea2d9990 Merge pull request #9554 from NopemanMcHalt/assu 
[READY] Desperate Assistance Battleforce
 2019-11-14 15:43:51 -07: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
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
kevinz000
e70a76085c Merge pull request #9789 from PersianXerxes/fixReagentDescriptions 
Corrects the descriptions of meth and ephedrine
 2019-11-14 01:38:01 -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
kappa-sama
6ad9c7fef0 no shotgun i guess 
shit guess i gotta add this to traumas too
 2019-11-13 17:01:30 -05:00
kappa-sama
17d8998fef emergent gameplay 2019-11-13 16:58:51 -05:00
Anonymous
837052740a Merge branch 'master' into assu 
# Conflicts Resolved:
#	icons/mob/head.dmi
#	icons/obj/clothing/hats.dmi
 2019-11-13 11:59:53 +03: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
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
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
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
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
Ghommie
29114de3f1 The actual waterflower, am I funny yet? 2019-11-12 00:47:36 +01: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
DeltaFire
421be859fb Ok nice typo gang 2019-11-11 21:08:32 +01:00
Ghommie
42d9e3cf51 Porting Robustin's Syndicate Infiltrator PR 2019-11-11 18:49:18 +01:00
DeltaFire
51aacedb9f Little fix 2019-11-11 18:17:07 +01:00
DeltaFire
3d2986fd06 Fixes the sin plush sprite + MORE PLUSHIES 
What it says on the label, fixes the sin plushie sprite as the size was wrong previously and adds two more lizzers

Also fixes a typo weh
 2019-11-11 17:32:06 +01:00
DeltaFire
1c6c188033 Exo plush 
Adds a AI plushie for exo since this PR is slowly getting filled with plushies
guaranteered non-malf!
 2019-11-11 01:05:16 +01:00
Ghommie
4c1eba0d81 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit226 2019-11-10 23:52:48 +01:00
DeltaFire
56720ea99c Merging kevinz's plush PR into mine 
Adds the kara plushie, the new skylar sprite and the trillby fix into the code, all without any missing syntax elements! Yay!
 2019-11-10 22:27:06 +01:00
Dap
041c35202b Ports Closet & Crate Initialization Fixes 
Ports a similarly named pull request (thank you cool cat).
 2019-11-10 14:17:34 -07:00
Ghommie
1e49ce76d3 Dreamchecker compatibility changes, part 1. 2019-11-10 20:48:30 +01:00
kevinz000
c4849ead74 Merge pull request #9727 from BlackMajor/Yeehaw 
Fixes ED209 Assemblies sometimes advancing to an invalid build stage.
 2019-11-10 11:46:03 -07:00
kevinz000
39e55edcb3 Merge pull request #9734 from Ghommie/Ghommie-cit324 
Ports CEV-eris delivery packages sprites, also dunking old syndie cybernetics box sprite.
 2019-11-10 11:45:47 -07:00
kevinz000
07447917de Merge pull request #9744 from Seris02/meteorhallucinations 
makes meteor hallucinations have an ETA now
 2019-11-10 11:44:41 -07:00
kevinz000
76e31a2799 Merge pull request #9745 from Ghommie/Ghommie-cit327 
rad flags fixes.
 2019-11-10 11:44:17 -07:00
kevinz000
95b98a5133 Merge pull request #9746 from Ghommie/Ghommie-cit328 
Ports "Cleans up the new alt clicking functionality" from /tg/
 2019-11-10 11:43:41 -07:00
kevinz000
48fb3a0f08 Merge pull request #9694 from kappa-sama/hosnowflake 
Buffs security, nerfs antags
 2019-11-10 11:40:41 -07:00
kevinz000
92455b5b8c Merge pull request #9695 from Ghommie/Ghommie-cit311 
Unmodularize and update pAI/Intellicards very slighty.
 2019-11-10 11:40:14 -07:00
kevinz000
814321beeb Merge pull request #9696 from Ghommie/Ghommie-cit312 
clock welder overlay fix.
 2019-11-10 11:39:54 -07:00
kevinz000
e8219dd9f7 Merge pull request #9697 from Poojawa/patch-1 
Better Health Analyzer formatting
 2019-11-10 11:35:07 -07:00
kevinz000
d1f6483687 Merge pull request #9704 from Ghommie/Ghommie-cit314 
Minor ninja tweaks and stealth nerf.
 2019-11-10 11:31:25 -07:00
kevinz000
e0626d12b1 Merge pull request #9707 from BonniePandora/Weldhelmets 
Port Welding Hard Hats from /tg/
 2019-11-10 11:30:54 -07:00
kevinz000
487e1806e7 Merge pull request #9709 from Trilbyspaceclone/cargo_memes_3 
Adds 8 more sci crates to cargo
 2019-11-10 11:30:33 -07:00