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 2026-01-06 23:23:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,815 Commits 55 Branches 0 Tags
05a954f0001b036f5529c1f0189537fe18b3128d
Commit Graph

21349 Commits

Author SHA1 Message Date
Ghommie
05a954f000 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611 2020-04-13 02:01:01 +02:00
kevinz000
d60932ca5d Merge pull request #11697 from Ghommie/Ghommie-cit655 
Ports "Obliterates item_color: new washing machine functionality edition"
 2020-04-12 16:16:37 -07:00
Ghom
b00e97b848 Merge pull request #10732 from kevinz000/eldritch_affairs 
Eldritch Affairs
 2020-04-12 20:47:19 +02:00
Lin
4e1079bc9a Merge pull request #11786 from Citadel-Station-13/Ghommie-patch-1 
I did a oopsie and made containment bags also stop radiation internal to a contained object.
 2020-04-12 16:20:08 +00:00
Ghom
fc58a34248 Merge pull request #11823 from Putnam3145/contam-buff 
Bringing contamination back
 2020-04-12 06:29:40 +02:00
Ghom
f5852424e3 Merge pull request #11812 from Auris456852/master 
Adds admin printer noise for Centcomm/Syndicate messages
 2020-04-12 06:25:52 +02:00
Ghom
3f573fb611 Merge pull request #11814 from kappa-sama/patch-19 
fixes stomping and increases Stam damage from krav
 2020-04-12 06:24:57 +02:00
Ghom
28642ce39c Merge pull request #11816 from necromanceranne/broke_dodging 
fixes rising bass and sleeping carp not dodging
 2020-04-12 06:23:47 +02:00
Ghom
a96f6238df Merge pull request #10891 from Trilbyspaceclone/more_crates+bags 
[Ready]Better crate options
 2020-04-12 05:48:20 +02:00
Ghom
d693d3ef26 Merge pull request #11807 from Citadel-Station-13/kevinz000-patch-4 
datum pipeline null gasmix stack trace now gives a REF()
 2020-04-12 05:46:07 +02:00
Ghom
1babc75a69 Merge pull request #11818 from spookydonut/patch-1 
Update spacemandmm to 1.4
 2020-04-11 23:59:31 +02:00
Putnam
c8ebc6411e Actually let's make it... differenter. 2020-04-11 12:58:43 -07:00
Putnam
b5a150911c Massively buffs contamination numbers 2020-04-11 12:43:14 -07:00
Putnam
a779ec2411 Makes contamination work (whoops) 2020-04-11 12:42:25 -07:00
spookydonut
a6f6a27c87 Update code/modules/vending/_vending.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-04-12 00:53:57 +08:00
Ghom
848c1996e4 Merge pull request #11806 from Citadel-Station-13/kevinz000-patch-3-1 
removes hotspot expose from skateboards
 2020-04-11 18:31:26 +02:00
Ghom
ae1785af70 Merge pull request #11802 from Akrilla/alien_attack 
Fixes attack_alien damage
 2020-04-11 18:31:07 +02:00
Ghom
11fa208838 Merge pull request #11800 from Akrilla/changling-readapt 
Fixes up changling readapting
 2020-04-11 18:30:49 +02:00
Ghom
f9f1bbc05f Merge pull request #11804 from Akrilla/beepsky-tie 
Fixes beepsky ziptie weirdness
 2020-04-11 13:40:24 +02:00
spookydonut
230e5fca20 fix everything 2020-04-11 15:32:09 +08:00
Akrilla
8abc0cc0a7 !on 2020-04-11 05:24:24 +01:00
necromanceranne
b6d079f91f fixes rising bass and sleeping carp not dodging 2020-04-11 13:00:32 +10:00
Ghom
cd2edb3cf1 dont need to null when qdeling later (#11797) 2020-04-11 01:59:46 +02:00
Akrilla
747be9cbe4 Better random plush spawning (#11792) 
* better spawning

* check list size

* changes
 2020-04-11 01:59:29 +02:00
kappa-sama
2afda4c216 forgot oop 2020-04-10 14:24:20 -04:00
kappa-sama
91726f340a Update krav_maga.dm 2020-04-10 14:08:16 -04:00
Ghom
a75bd30911 Update carbon_defense.dm 2020-04-10 19:54:12 +02:00
Putnam3145
b939359e35 Made my choice thing actually... do something (#11787) 2020-04-10 18:16:19 +02:00
kevinz000
d5769a6ee4 Update carbon_defense.dm (#11738) 2020-04-10 18:13:50 +02:00
Auris456852
03f583e5ff Adds admin printer noise for Centcomm/Syndicate messages 2020-04-10 18:50:52 +03:00
Ghom
7d67eee24c Update RCL.dm 2020-04-10 15:51:09 +02:00
Arturlang
b40fb55539 Fixes mesmerzie and makes it work better (#11785) 
* Weh

* Mesmerize works a lot nicer now
 2020-04-10 15:41:35 +02:00
kevinz000
d19dd8f2e1 fixes baystruments (#11790) 
* fix

* sigh
 2020-04-10 15:36:42 +02:00
kevinz000
185b38e109 Update scooter.dm 2020-04-10 04:33:35 -07:00
kevinz000
9d931c0a3a Update datum_pipeline.dm 2020-04-10 04:32:16 -07:00
kevinz000
b09ac26ab2 Update scooter.dm 2020-04-10 04:25:53 -07:00
Akrilla
2a05903808 do_after 2020-04-10 04:26:35 +01:00
Akrilla
5c74e239a0 wew 2020-04-10 03:43:18 +01:00
Akrilla
ec5db05bdc fixes up readapting 2020-04-10 03:18:13 +01:00
Akrilla
753be141be show pref change (#11793) 2020-04-09 20:32:50 +02:00
Akrilla
87dce0c3e9 dont need to null when qdeling later 2020-04-09 18:41:39 +01:00
Putnam3145
a203ef7de5 Merge pull request #11794 from Citadel-Station-13/kevinz000-patch-1 
DefaultCombatKnockdown now respects CANKNOCKDOWN status flag
 2020-04-09 10:07:25 -07:00
Arturlang
f80900fd0b Fixes vendors not eating coins (#11795) 2020-04-09 19:07:11 +02:00
kevinz000
0cd7437f49 Update status_procs.dm 2020-04-09 09:33:21 -07:00
kevinz000
bfad661c1c Merge pull request #11737 from Trilbyspaceclone/patch-330 
Buffs Stimpacks
 2020-04-09 06:57:13 -07:00
Ghommie
7c1e5aa2c9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655 2020-04-09 15:46:19 +02:00
Putnam3145
5078b5875a Fixes my oldish badcode. (#11781) 2020-04-09 14:48:58 +02:00
Ghom
98312ec2c8 Update radiation.dm 2020-04-09 14:21:15 +02:00
Ghom
3433205130 Makes radioactive atoms actually still radiate other atoms within itself even if contained. 2020-04-09 13:56:19 +02:00
kevinz000
7cb2057bb0 Merge pull request #11751 from Arturlang/kills_the_shitty_fix 
TGUI Next vendors plus spritesheet port from TG
 2020-04-09 03:53:08 -07:00