Commit Graph

17786 Commits

Author SHA1 Message Date
Dan-Neposh
17f85d7d8d war golem, cyborg, soul vessel rites added, scarab scripture added 2021-01-25 05:22:20 -05:00
Dan-Neposh
fb75c6a949 adds in ending sequence for Ratvar spawning, + various other changes
above, as well as cancelling out each gods round end sequence depending on who wins their fight, plus some description edits which make more sense with the station based setting
2021-01-22 00:04:04 -05:00
Dan-Neposh
48d8ffc9a7 reverts every change slowing down developement of this PR 2021-01-21 23:42:23 -05:00
Dan-Neposh
04d5721c4d Merge branch 'master' into clockcultrework_v2 2021-01-14 19:51:15 -05:00
Dan-Neposh
6ddfa8170f Adds a round ending sequence to Ratvar's spawn
Along with its sounds + making the Neovgre cannon sound better. Audio courtesy of Dzahlus.
2021-01-14 18:29:50 -05:00
Dan-Neposh
ab5cffc360 Various edits in order to get this PR out finally 2021-01-14 12:56:55 -05: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
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
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
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
DeltaFire
8b2044b407 another 2021-01-13 23:42:20 +01:00
DeltaFire
1a521b846f thanks 2021-01-13 23:39:36 +01: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
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
Hatterhat
b36a1142fe on the precipice of stickiness 2021-01-12 16:58:20 -06:00
Hatterhat
cb40ad4764 atomization is cowardice actually 2021-01-12 16:08:17 -06:00
SiliconMain
bc64cedc2d Update misc_nodes.dm 2021-01-12 14:42:35 -06: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
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
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