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-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,301 Commits 55 Branches 0 Tags
66570144b9b51c61202a1bdad39864c5c3540cd6
Commit Graph

18077 Commits

Author SHA1 Message Date
silicons
72716068ba Merge pull request #14101 from Hatterhat/more-gauze-shit 
some other gauze parity dogshit
 2021-01-20 15:26:41 -07:00
silicons
8cb8ddef42 Merge pull request #13969 from Arturlang/blood_bag_tweaks 
Tweaks blood bag consumption
 2021-01-20 15:26:12 -07:00
silicons
83625305a2 Update uplink_clothing.dm 2021-01-20 15:24:09 -07:00
silicons
66874fe252 Merge pull request #14083 from shellspeed1/alternative-xeno-hive 
Removes the queen, and increases xeno variety in lavaland xenomorph ruin.
 2021-01-20 15:22:06 -07:00
silicons
2acdee8d01 Merge pull request #14076 from Hatterhat/cotton-stack-pull 
pulling cotton (or durathread) while standing on a pile of cotton (or durathread) picks all of them
 2021-01-20 15:21:44 -07:00
silicons
718cb3f501 Merge pull request #14092 from BlueWildrose/Timidwomen 
Adds Timid wo/man costumes
 2021-01-20 15:21:06 -07:00
silicons
fa587e3d1a Merge pull request #14100 from Hatterhat/sheath-exp 
twinsheath additions
 2021-01-20 15:20:45 -07:00
silicons
288bbcd334 Merge pull request #14107 from shellspeed1/Brings-back-mining-point-card-for-borgs 
Mining borgs get a point ID again.
 2021-01-20 15:17:47 -07:00
silicons
5afe3bbb6f Merge remote-tracking branch 'citadel/master' into ex_act_3 2021-01-20 15:15:10 -07:00
silicons
9f50ea66c8 Merge pull request #14104 from LetterN/semi-sync 
[s] semi sync- we forgot the anti ddos thing
 2021-01-20 15:14:37 -07:00
silicons
f6eca7afad hugboxy shit 2021-01-20 15:06:53 -07:00
Lin
d262f366e7 Merge pull request #14097 from Citadel-Station-13/silicons-patch-28 
i'm not sure why cargo's bird crate has every bird spawn with a headset but let's not have that
 2021-01-20 15:20:50 -06:00
Artur
41f4586f50 Forgot to undo some testing changes 2021-01-20 22:30:14 +02:00
Artur
87c9201707 No gunning sadly 2021-01-20 19:51:11 +02:00
Putnam3145
2debe930fc Merge pull request #14094 from kittycat2002/master 
Gives /datum/reagent/consumable/ethanol/species_drink a name
 2021-01-20 08:45:52 -08:00
Artur
66979e2364 Merge branch 'master' into revenant_TK 2021-01-20 18:27:11 +02:00
Artur
16e0b85b44 More funshit 2021-01-20 18:23:28 +02:00
Artur
3737c52df8 Funny actions 2021-01-20 15:23:34 +02:00
shellspeed1
81e37b6e33 Update robot_modules.dm 2021-01-19 21:40:47 -08:00
DeltaFire
721f9c6a7c Merge remote-tracking branch 'upstream/master' into heretic-target-fix 2021-01-20 06:32:37 +01:00
silicons
ae5cb78424 Update toggles.dm 2021-01-19 22:27:13 -07:00
DeltaFire
7136f5cffb boop 2021-01-20 06:09:20 +01:00
DeltaFire
4578f30001 brrt 2021-01-20 05:54:38 +01:00
Letter N
a68957dcc4 wow thanks tabnine 😂 2021-01-20 12:02:20 +08:00
Letter N
6547028272 what the fuck?? 2021-01-20 11:56:44 +08:00
Letter N
9fa6958a99 OH FUCK 2021-01-20 11:49:53 +08:00
Letter N
021b28a2b7 cleanup 
shitcode - b - gone
 2021-01-20 11:08:21 +08:00
Artur
745c825205 Give hotkey, but citadel 2021-01-20 04:21:57 +02:00
Arturlang
cc4c3533b7 Apply suggestions from code review 
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2021-01-20 02:25:22 +02:00
Hatterhat
a8cb8b79c6 for one, dont forget the sprites, dumbass 2021-01-19 17:40:34 -06:00
Hatterhat
e006587f4b today i will not test my code 2021-01-19 17:24:33 -06:00
Hatterhat
90b85480e1 uuuuuuuuuuuuugh 2021-01-19 17:07:10 -06:00
Hatterhat
1445f448e9 uuuuuuuuuuuuuuuuuuugh 2021-01-19 17:04:59 -06:00
Hatterhat
fccf24ac17 sheef 2021-01-19 16:54:49 -06:00
silicons
83566cdbe3 Update parrot.dm 2021-01-19 05:23:43 -07:00
silicons
dedb0cb62e Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-19 04:24:42 -07:00
Lin
16e2470e6b Merge pull request #14082 from kappa-sama/patch-45 
s
 2021-01-18 22:19:15 -06:00
Lin
1fa2b7b331 Merge pull request #14084 from Citadel-Station-13/silicons-patch-23 
robots don't get tired from swimming
 2021-01-18 20:39:57 -06:00
kittycat2002
b46caa77af Gives /datum/reagent/consumable/ethanol/species_drink a name 
This fixes an issue that occurs when attempting to find Ethanol by name using get_chem_id.
 2021-01-18 21:39:34 -05:00
timothyteakettle
837e766306 fixes sanitization 2021-01-19 01:04:01 +00:00
Timothy Teakettle
b956df2226 name description implement 2021-01-18 21:59:00 +00:00
Blue Wildrose
88c21942d0 Merge branch 'master' into Timidwomen 2021-01-18 14:42:52 -07:00
Blue Wildrose
381f27c5b1 will this work? 2021-01-18 14:28:16 -07:00
Blue Wildrose
5173a7f790 *SCREAM 2021-01-18 14:25:44 -07:00
Blue Wildrose
c79177ab07 Adds Timid wo/man outfits 2021-01-18 13:42:38 -07:00
Lin
58dde0f60e Merge pull request #14045 from Citadel-Station-13/silicons-patch-9 
gorilla pais
 2021-01-18 13:22:51 -06:00
Lin
73213b4bad Merge pull request #14079 from LetterN/patch-3 
Fixes this vending oversight
 2021-01-18 13:17:05 -06:00
Lin
61d4f2cdad Merge pull request #14080 from Citadel-Station-13/silicons-patch-21 
hooded suits now sync colors to their hood on extend
 2021-01-18 13:13:00 -06:00
Putnam3145
51fc5ae235 Merge pull request #14053 from Citadel-Station-13/silicons-patch-13 
"Make it so you can squeeze someone's hand when you hold it"
 2021-01-18 10:17:56 -08:00
silicons
0229078b58 Update foam_dart.dm 2021-01-18 02:32:21 -07:00