Commit Graph

40581 Commits

Author SHA1 Message Date
CitadelStationBot
90490033d3 Automatic changelog generation for PR #14042 [ci skip] 2021-01-15 05:00:11 -06:00
silicons
68e9be9647 Merge pull request #14042 from kiwedespars/dildo-1
adds klonk sound effect for literal horsecock dildo
2021-01-15 04:00:08 -07:00
CitadelStationBot
39996111fa Automatic changelog generation for PR #14062 [ci skip] 2021-01-15 03:55:06 -06:00
silicons
beea362967 Merge pull request #14062 from kappa-sama/kaiofix
i don't wanna talk about it
2021-01-15 02:55:02 -07:00
kappa-sama
1134e1ce20 i don't wanna talk about it 2021-01-15 00:36:45 -05:00
silicons
1df2257e61 Merge pull request #14052 from SiliconMain/baitbegone
Update engineering.dm
2021-01-13 22:43:01 -07:00
SiliconMain
cccb547a72 Update engineering.dm 2021-01-13 23:41:49 -06:00
CitadelStationBot
109b61df9a Automatic changelog generation for PR #14039 [ci skip] 2021-01-13 22:02:26 -06:00
silicons
28849dd8e9 Merge pull request #14039 from Hatterhat/sticky-start
on the precipice of stickiness - sticky tape roundstart tech
2021-01-13 21:02:23 -07:00
CitadelStationBot
23ad56d880 Automatic changelog generation for PR #13975 [ci skip] 2021-01-13 17:58:07 -06:00
silicons
aa830b257a Merge pull request #13975 from zeroisthebiggay/paramed
resprites paramedic softsuit to not violate r*d cr*ss copyright and resprites the paramedic closet
2021-01-13 16:58:04 -07:00
CitadelStationBot
71c73905ce Automatic changelog generation for PR #14021 [ci skip] 2021-01-13 17:57:45 -06:00
silicons
ce0891c2eb Merge pull request #14021 from DeltaFire15/emp-fuckeroni
Fixes combat mode being permanently disabled under specific circumstances
2021-01-13 16:57:42 -07:00
CitadelStationBot
a78e723cc0 Automatic changelog generation for PR #14034 [ci skip] 2021-01-13 17:53:20 -06:00
silicons
82cc5da8df Merge pull request #14034 from DeltaFire15/blindness-edgecase-fix
Fixes some edge cases regarding system corruption
2021-01-13 16:53:17 -07:00
CitadelStationBot
925d9bfaba Automatic changelog generation for PR #14035 [ci skip] 2021-01-13 17:53:04 -06:00
silicons
bcb2e16cef Merge pull request #14035 from SiliconMain/baitbegone
Comments out hololocks
2021-01-13 16:53:01 -07:00
CitadelStationBot
a2ed0fddae Automatic changelog generation for PR #14032 [ci skip] 2021-01-13 17:50:53 -06:00
silicons
c66874f732 Merge pull request #14032 from kappa-sama/kaiowhat
two toggled self-buffing spells that have no relation to any anime or video game in particular
2021-01-13 16:50:50 -07:00
CitadelStationBot
50cd6cf393 Automatic changelog generation for PR #14025 [ci skip] 2021-01-13 17:48:08 -06:00
silicons
310a631ffa Merge pull request #14025 from DeltaFire15/synth-robotics-revival
More Synth tweaks
2021-01-13 16:48:05 -07:00
CitadelStationBot
cd0f5316a8 Automatic changelog generation for PR #14009 [ci skip] 2021-01-13 17:47:36 -06:00
silicons
f7cadc3293 Merge pull request #14009 from shellspeed1/wing-stuff
Ports a bunch of wings from cit RP and fulpstation [Ready]
2021-01-13 16:47:34 -07:00
DeltaFire
8b2044b407 another 2021-01-13 23:42:20 +01:00
DeltaFire
1a521b846f thanks 2021-01-13 23:39:36 +01:00
CitadelStationBot
1fd9bc8a50 Automatic changelog generation for PR #14015 [ci skip] 2021-01-13 12:40:07 -06:00
Lin
04c5d34cb6 Merge pull request #14015 from DeltaFire15/synth-stuffs
Tweaks some Synth damage stuff
2021-01-13 18:40:03 +00:00
CitadelStationBot
57d1052a6a Automatic changelog generation for PR #14033 [ci skip] 2021-01-13 11:39:44 -06:00
DeltaFire
6bdca6b8e4 Merge pull request #14033 from BlueWildrose/colormateys
Adds Color Mates to every station (except Snaxi)
2021-01-13 18:39:40 +01:00
CitadelStationBot
eba8a16486 Automatic changelog generation for PR #14038 [ci skip] 2021-01-13 11:29:03 -06:00
DeltaFire
a9b420f68f Merge pull request #14038 from Hatterhat/atomization-never-heard-of-her
an unatomic PR designed for maximizing maintainer suffering
2021-01-13 18:28:59 +01:00
CitadelStationBot
9190fd4786 Automatic changelog generation for PR #14036 [ci skip] 2021-01-13 11:26:25 -06:00
DeltaFire
7b02928558 Merge pull request #14036 from BlueWildrose/YouMadeMeDropMyCatgirl
You will no longer unbuckle fireman-carried/piggybacked people when touching someone on help or grab intent
2021-01-13 18:26:22 +01:00
DeltaFire
16c8ff1e52 Merge pull request #14027 from MrJWhit/stops-code-from-seeping-into-ic-chat
Port: "stops code from seeping into ic chat"
2021-01-13 18:21:30 +01:00
DeltaFire
84a95e5ddd Merge pull request #13994 from Citadel-Station-13/clowncar-safety
hugboxes admin twitchplays clown car to not explode on death to avoid killing people (by default)
2021-01-13 17:56:00 +01:00
CitadelStationBot
a2ef243c6d Automatic changelog generation for PR #14019 [ci skip] 2021-01-13 10:55:04 -06:00
DeltaFire
68557c84ae Merge pull request #14019 from timothyteakettle/stop-abusing-envys-knife
species with NOTRANSSTING cannot have envy's knife used on them
2021-01-13 17:54:57 +01:00
kiwedespars
ce1d73a6ac Update dildos.dm 2021-01-12 22:42:01 -08:00
Hatterhat
b36a1142fe on the precipice of stickiness 2021-01-12 16:58:20 -06:00
Hatterhat
508475d2a4 sabre off inhand fix 2021-01-12 16:36:02 -06:00
Hatterhat
2042de0f19 sterilegauze buff 2021-01-12 16:13:08 -06:00
Hatterhat
cb40ad4764 atomization is cowardice actually 2021-01-12 16:08:17 -06:00
Blue Wildrose
5436db5f3b Add a color mate to the ghost cafe as well, yeah 2021-01-12 13:55:42 -07:00
SiliconMain
2d3e24fee4 Update engineering.dm 2021-01-12 14:43:54 -06:00
SiliconMain
bc64cedc2d Update misc_nodes.dm 2021-01-12 14:42:35 -06:00
Blue Wildrose
059d35921a quit making me drop my catgirl 2021-01-12 13:41:23 -07:00
SiliconMain
a26590965e Update misc_designs.dm 2021-01-12 14:41:10 -06:00
DeltaFire
c9e735b6b4 edge cases 2021-01-12 21:18:33 +01:00
kappa-sama
f3e328af03 hot sauce 2021-01-12 10:04:56 -05:00
kappa-sama
656d95ce2f i rewrote this at 2 in the morning 2021-01-12 09:57:36 -05:00