Commit Graph

26867 Commits

Author SHA1 Message Date
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
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
Lin f4c4e0721b Merge pull request #14012 from Citadel-Station-13/silicons-patch-6
fixes colormate last_matrix saving (again)
2021-01-10 19:36:47 +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
DeltaFire 3f6939c1cb fix 2021-01-10 06:20:27 +01:00
silicons 121104ca6c Merge pull request #14014 from necromanceranne/bokken_fixes_2
Bokken Fixes 2: Missing sprites and stuff
2021-01-09 19:49:10 -07: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 fffafff5d3 Merge pull request #13995 from DeltaFire15/xeno-clickdelay
(Somewhat) fixes clickdelay when attacking objects.
2021-01-09 15:38:07 -07:00
silicons 22a32d25b4 Merge pull request #14006 from DeltaFire15/borg-shell-dupe
Attempting to complete a borg AI shell without a cell installed no longer causes issues
2021-01-09 15:37:45 -07:00