Commit Graph

18815 Commits

Author SHA1 Message Date
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
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
MrJWhit
893199679d Update arcade.dm 2021-01-11 08:46:12 -05:00
Blue Wildrose
b4fbeddda9 Probably makes more sense 2021-01-11 00:12:13 -07:00
Blue Wildrose
4ec834c3dd your dick is no longer a big fat noodle 2021-01-11 00:00:48 -07:00
DeltaFire
8590d364e0 spellcheck 2021-01-11 02:18:58 +01:00
DeltaFire
2b1d79dae0 synth medstuff 2021-01-11 02:11:30 +01:00
Lin
95101ac36a Merge pull request #14013 from Citadel-Station-13/compressor
lets science actually print explosive compressors
2021-01-11 00:21:11 +00:00
Timothy Teakettle
08d2b0bc17 Update code/modules/ruins/objects_and_mobs/sin_ruins.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
2021-01-10 23:41:52 +00:00
silicons
cd62c45902 Update nuclearbomb.dm 2021-01-10 03:52:16 -07:00
silicons
72bc00bc22 Merge pull request #13993 from Arturlang/cursed_heart_tweaks
Makes cursed heart more tolerable
2021-01-10 01:36:43 -07:00
Putnam3145
07399d2c93 Merge pull request #13949 from Citadel-Station-13/silicons-patch-60
clamps cyborg sprint to 10 tiles/second and fixes them going methspeed
2021-01-09 22:16:14 -08:00
timothyteakettle
99b26c08be Update sin_ruins.dm 2021-01-10 01:56:18 +00:00
shellspeed1
58426beadc readds missing none wings for insects 2021-01-09 16:15:50 -08:00
silicons
fd77be9b89 Update _status_effects.dm 2021-01-09 16:44:56 -07:00
shellspeed1
679f097e27 resets names 2021-01-09 15:39:50 -08:00
silicons
2525334bb0 smooth movement twaeks 2021-01-09 15:30:56 -08:00
silicons
9733305997 Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-09 14:56:32 -08:00
silicons
e680d58a03 fixes 2021-01-09 14:56:29 -08:00
silicons
656691912e Merge pull request #13965 from Xantholne/GoodNightDisky
Good Night Disky
2021-01-09 15:39:06 -07:00
silicons
3db556b9b7 Merge pull request #14007 from DeltaFire15/heretic-spec-role-fix
Fixes heretic special role adding / removal
2021-01-09 15:37:35 -07:00
silicons
2bf5a0e91e Merge pull request #14008 from TheSpaghetti/patch-5
Removes double punctuation in the tumor bread description.
2021-01-09 15:37:19 -07:00
silicons
778be450f1 Merge pull request #14010 from shellspeed1/fixes-missing-organs-in-tech-fab
Fixes some missing upgraded cybernetic organs in the exofab and also makes prosthetic limbs printable at them.
2021-01-09 15:36:28 -07:00
silicons
c36151b4cf Update machine_designs_sci.dm 2021-01-09 15:35:26 -07:00
DeltaFire
bc29b80c94 :lazy: 2021-01-09 22:46:40 +01:00
Timothy Teakettle
d459f6db91 Update looc.dm 2021-01-09 21:30:18 +00:00
DeltaFire
648c9f951b bonk 2021-01-09 22:30:09 +01:00
DeltaFire
125ea9dad2 vitality sigil drain 2021-01-09 20:44:51 +01:00
DeltaFire
05f7991981 snap 2021-01-09 20:37:24 +01:00
Lin
5e08df700f Merge pull request #13939 from silicons/reagentlogs
low level reagent logging additions
2021-01-09 16:24:40 +00:00
silicons
b0a94a6e1c Update engineering_nodes.dm 2021-01-09 07:30:14 -07:00
silicons
34c5d99afb Update machine_designs_sci.dm 2021-01-09 07:29:31 -07:00
shellspeed1
04d60c85d9 a 2021-01-09 03:06:48 -08:00
shellspeed1
773a04e5ea Ports wings 2021-01-09 01:56:56 -08:00
necromanceranne
9c0989d233 Merge remote-tracking branch 'upstream/master' into robocoat 2021-01-09 19:02:38 +11:00
TheSpaghetti
b52e8bf447 double punctuation bad
no
2021-01-09 00:18:15 -05:00
silicons
bffc43e95e fixes 2021-01-08 18:59:26 -08:00
silicons
849e9405fd projectile fix 2021-01-08 18:53:49 -08:00
silicons
bd9c979b07 riding datums 2021-01-08 18:48:59 -08:00
DeltaFire
9cfd3c073e smol fix 2021-01-09 00:33:20 +01:00
DeltaFire
56a2892fd3 sigh 2021-01-08 23:48:32 +01:00
zerothebigboy
880b988813 Merge branch 'paramed' of https://github.com/zeroisthebiggay/Citadel-Station-13 into paramed 2021-01-08 14:33:14 -05:00
silicons
bd3761d39e proper smooth movement 2021-01-08 10:51:48 -08:00
silicons
ddad368d6a Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-08 00:33:57 -08:00