Commit Graph

40831 Commits

Author SHA1 Message Date
CitadelStationBot
2bbfe67c80 Automatic changelog generation for PR #14083 [ci skip] 2021-01-20 16:22:09 -06: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
CitadelStationBot
4a707cce1d Automatic changelog generation for PR #14078 [ci skip] 2021-01-20 16:21:58 -06:00
silicons
30755bfeb9 Merge pull request #14078 from MrJWhit/metastation-toxins-fix-2-electric-bogaloo
Gives metastation toxins storage a scrubber 'n vent
2021-01-20 15:21:55 -07:00
CitadelStationBot
1a33feff25 Automatic changelog generation for PR #14076 [ci skip] 2021-01-20 16:21:47 -06: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
CitadelStationBot
f238f73716 Automatic changelog generation for PR #14092 [ci skip] 2021-01-20 16:21:09 -06:00
silicons
718cb3f501 Merge pull request #14092 from BlueWildrose/Timidwomen
Adds Timid wo/man costumes
2021-01-20 15:21:06 -07:00
silicons
c786eb48ce Merge pull request #14095 from necromanceranne/sprite_fixies
Fixes deleted hypereutatic blade sprites
2021-01-20 15:20:55 -07:00
CitadelStationBot
f14dd4175c Automatic changelog generation for PR #14100 [ci skip] 2021-01-20 16:20:48 -06:00
silicons
fa587e3d1a Merge pull request #14100 from Hatterhat/sheath-exp
twinsheath additions
2021-01-20 15:20:45 -07:00
CitadelStationBot
84453c812d Automatic changelog generation for PR #14107 [ci skip] 2021-01-20 16:17:50 -06: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
CitadelStationBot
acee2eea95 Automatic changelog generation for PR #14109 [ci skip] 2021-01-20 16:17:40 -06:00
silicons
f6a8306174 Merge pull request #14109 from Arturlang/space_tackling_meme_fix
Fixes the space tackling meme
2021-01-20 15:17:36 -07:00
CitadelStationBot
60200d4f0e Automatic changelog generation for PR #14110 [ci skip] 2021-01-20 16:17:15 -06:00
silicons
f7c6dbd8ba Merge pull request #14110 from BlueWildrose/nicebobbertsonsyougotthere
Removes oversized genitalia analysis from medical scanners
2021-01-20 15:17:12 -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
CitadelStationBot
da412a2269 Automatic changelog generation for PR #14097 [ci skip] 2021-01-20 15:20:54 -06: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
CitadelStationBot
f1f6e35804 Automatic changelog generation for PR #14094 [ci skip] 2021-01-20 10:45:55 -06: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
Blue Wildrose
80ccc93fd7 Removes breast and penis analysis from medical scanners 2021-01-20 07:32:03 -07:00
Artur
5aa710ffd7 spess 2021-01-20 16:05:20 +02:00
Artur
ef950400a4 Fixes the space tackling meme 2021-01-20 15:50:41 +02:00
shellspeed1
81e37b6e33 Update robot_modules.dm 2021-01-19 21:40:47 -08:00
DeltaFire
1057721d2a Merge pull request #14106 from Citadel-Station-13/silicons-patch-29
let's pretend this didn't happen move along nothing to see here (fixes hood toggles)
2021-01-20 06:32:01 +01:00
silicons
ae5cb78424 Update toggles.dm 2021-01-19 22:27:13 -07: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
02ca168df3 why are we building windows facing nothing but rock infront of it? 2021-01-20 11:37:44 +08:00
Letter N
021b28a2b7 cleanup
shitcode - b - gone
2021-01-20 11:08:21 +08:00
CitadelStationBot
4a3fe48710 Automatic changelog generation for PR #13610 [ci skip] 2021-01-19 20:29:29 -06:00
silicons
2b16435033 Merge pull request #13610 from Putnam3145/fix-eq-hogging
Makes the atmos subsystem pause correctly
2021-01-19 19:29:19 -07:00
Letter N
2e2a609d4b Merge remote-tracking branch 'origin/master' into semi-sync 2021-01-20 10:24:28 +08:00
Letter N
c08765d0eb let's not get ddosed 2021-01-20 10:23:30 +08:00
Putnam
a1b208f1da Revert "Update json_verifier.py"
This reverts commit 3c43345ff6.
2021-01-19 18:23:08 -08:00
Putnam
3c43345ff6 Update json_verifier.py 2021-01-19 18:22:50 -08:00
CitadelStationBot
131b11f4ae Automatic changelog generation for PR #13826 [ci skip] 2021-01-19 19:22:11 -06:00
Putnam3145
f7f9185073 Merge pull request #13826 from LetterN/semi-sync
/tg/ ""hardsync"" part one of many*
2021-01-19 17:22:05 -08:00
Hatterhat
fccf24ac17 sheef 2021-01-19 16:54:49 -06:00
CitadelStationBot
b1fb0b3095 Automatic changelog generation for PR #14089 [ci skip] 2021-01-19 12:46:17 -06:00
Lin
11ab32d8d6 Merge pull request #14089 from MrJWhit/mining-station-minor-QoL
Minor minning station QoL
2021-01-19 12:46:13 -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
silicons
f0a9a7a179 fix 2021-01-19 04:21:21 -07:00
necromanceranne
741fd455ec Fixes deleted hypereutatic blade sprites 2021-01-19 19:46:11 +11:00
CitadelStationBot
e6e9a22615 Automatic changelog generation for PR #14082 [ci skip] 2021-01-18 22:19:19 -06:00
Lin
16e2470e6b Merge pull request #14082 from kappa-sama/patch-45
s
2021-01-18 22:19:15 -06:00