 silicons
|
bcb2e16cef
|
Merge pull request #14035 from SiliconMain/baitbegone
Comments out hololocks
|
2021-01-13 16:53:01 -07: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 |
|
|
silicons
|
310a631ffa
|
Merge pull request #14025 from DeltaFire15/synth-robotics-revival
More Synth tweaks
|
2021-01-13 16:48:05 -07: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 |
|
|
silicons
|
9ddb3dc5d9
|
fix
|
2021-01-13 16:22:43 -07:00 |
|
|
DeltaFire
|
8b2044b407
|
another
|
2021-01-13 23:42:20 +01:00 |
|
|
silicons
|
ea07ad6e48
|
Merge remote-tracking branch 'citadel/master' into tgsync
|
2021-01-13 15:41:28 -07:00 |
|
|
DeltaFire
|
1a521b846f
|
thanks
|
2021-01-13 23:39:36 +01:00 |
|
|
silicons
|
06bc57580a
|
Update stunbaton.dm
|
2021-01-13 15:22:41 -07:00 |
|
|
silicons
|
701bacd355
|
Update stunbaton.dm
|
2021-01-13 15:06:35 -07:00 |
|
|
silicons
|
33ca6c34a1
|
Update pai.dm
|
2021-01-13 14:48:59 -07:00 |
|
|
silicons
|
343ef7db2c
|
fixes
|
2021-01-13 14:23:35 -07:00 |
|
|
silicons
|
3fe2776a6a
|
fix
|
2021-01-13 13:44:46 -07:00 |
|
|
Lin
|
04c5d34cb6
|
Merge pull request #14015 from DeltaFire15/synth-stuffs
Tweaks some Synth damage stuff
|
2021-01-13 18:40:03 +00: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 |
|
|
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 |
|
|
corin9090
|
9f0280309d
|
Belt slot prayer beads
uwu
|
2021-01-13 09:24:55 -08: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 |
|
|
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 |
|
|
Timothy Teakettle
|
db1c8034e3
|
Update living.dm
|
2021-01-13 15:58:23 +00:00 |
|
|
Artur
|
2f619ffc4e
|
Traits
|
2021-01-13 10:27:10 +02:00 |
|
|
kiwedespars
|
ce1d73a6ac
|
Update dildos.dm
|
2021-01-12 22:42:01 -08:00 |
|
|
Artur
|
d5e99e9cef
|
TESTING
|
2021-01-13 05:56:10 +02:00 |
|
|
DeltaFire
|
6192d4ddab
|
fixes
|
2021-01-13 00:08:59 +01:00 |
|
|
Hatterhat
|
b36a1142fe
|
on the precipice of stickiness
|
2021-01-12 16:58:20 -06:00 |
|
|
DeltaFire
|
f591bff85b
|
sprite stuff
|
2021-01-12 23:54:40 +01:00 |
|
|
DeltaFire
|
032c169098
|
whoops
|
2021-01-12 23:29:51 +01: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 |
|
|
DeltaFire
|
13beddd42b
|
nanogel time
|
2021-01-12 23:02:44 +01: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
|
656d95ce2f
|
i rewrote this at 2 in the morning
|
2021-01-12 09:57:36 -05:00 |
|
|
kappa-sama
|
f98edf0eaa
|
shush
|
2021-01-12 09:55:18 -05:00 |
|
|
kappa-sama
|
a58141898c
|
i was tired
|
2021-01-12 09:45:13 -05:00 |
|
|
kappa-sama
|
3d9e907532
|
fixed
|
2021-01-12 02:19:13 -05:00 |
|
|
kappa-sama
|
c751f114aa
|
finally
|
2021-01-12 01:42:55 -05:00 |
|
|
BlueWildrose
|
19078449fe
|
Merge branch 'master' into SkidoodleSkidaddle
|
2021-01-11 20:26:21 -07:00 |
|
|
DeltaFire
|
63aaac873f
|
Merge pull request #13973 from Citadel-Station-13/shitcode
completely removes penis/breast enlargement effects due to it being completely unmaintained and to be frank awful
|
2021-01-12 01:30:24 +01:00 |
|
|
Lin
|
9d4b30d4e9
|
Merge pull request #14023 from Citadel-Station-13/silicons-patch-8
the disk now snores every minute instead of every 2 seconds
|
2021-01-12 00:01:44 +00:00 |
|
|
Artur
|
df825b4441
|
deltafire's suggested fixes
|
2021-01-12 00:23:39 +02:00 |
|
|
Putnam
|
02efd6237f
|
Replaces majority judgment with usual judgement
|
2021-01-11 12:39:18 -08:00 |
|
|
HeroWithYay
|
f8870c7c5d
|
Fixed another error in the examine text.
|
2021-01-12 08:16:10 +13:00 |
|
|
HeroWithYay
|
f4c5fa9b7c
|
Fixed an error in the examine text.
|
2021-01-12 08:15:20 +13:00 |
|
|
HeroWithYay
|
2c8b83bcaa
|
Wormhole Projector and Gravity Gun now use anomaly cores instead of firing pins.
|
2021-01-12 08:03:15 +13:00 |
|
|
DeltaFire
|
4eab9e6520
|
why not
|
2021-01-11 18:06:43 +01:00 |
|