Commit Graph

1665 Commits

Author SHA1 Message Date
silicons
a4e6df8f9a Merge pull request #13738 from DeltaFire15/heretic-tweaks
Updates the heretics gamemode with a bunch of changes from /tg/
2020-12-09 21:47:46 -07:00
DeltaFire
b186ec96ad rune invisible to sillycones. 2020-12-07 22:19:30 +01:00
DeltaFire
73d3234882 buncha changes 2020-12-07 22:15:04 +01:00
DeltaFire
33e4486c53 Merge remote-tracking branch 'upstream/master' into heretic-tweaks 2020-12-07 21:18:11 +01:00
DeltaFire
dd4f60a24b *snap 2020-12-06 17:37:46 +01:00
silicons
6bd13c9054 Merge pull request #13695 from shellspeed1/Better-Ling-change
Better version of ling change
2020-11-28 09:13:12 -07:00
DeltaFire15
a1d38033a4 Merge pull request #13576 from Sonic121x/patch-2
Add a bunch of digitigrade uniform
2020-11-27 22:31:10 +01:00
Hatterhat
2de9b55703 uuuuuuuuuuuugh 2020-11-25 02:26:23 -06:00
shellspeed1
c8f8972027 Removes the ling dna limit 2020-11-20 03:03:38 -08:00
shellspeed1
f900643922 h 2020-11-20 02:44:15 -08:00
shellspeed1
6cc7f15743 Update changeling.dm 2020-11-20 01:41:14 -08:00
silicons
f8d43b7544 Merge pull request #13679 from DeltaFire15/system-corruption
[TESTMERGE ONLY] System Corruption for robotic species
2020-11-18 22:54:51 -07:00
Putnam3145
9d300ade35 Merge pull request #13677 from silicons/newlines
Adds missing EOF newlines
2020-11-18 17:50:38 -08:00
silicons
891d4ec76e Merge pull request #13681 from DeltaFire15/supplypod-shrapnel
Fixes a bunch of supplypod related stuff
2020-11-17 01:12:56 -07:00
silicons
1c915c2e6f Merge pull request #13676 from DeltaFire15/borg-slab-fix
Very minor fix to clockie borg slab ui
2020-11-17 01:12:28 -07:00
silicons
b9b67f62a3 Merge pull request #13673 from Arturlang/sacrifice_tweaks
Makes construct mind saving reference the mind, fixing some issues
2020-11-17 01:10:45 -07:00
DeltaFire
922129abd2 proc override stuff 2020-11-15 21:12:01 +01:00
DeltaFire
3e19557e8f and more fixes. 2020-11-14 19:38:39 +01:00
silicons
803bff4e5f funny 2020-11-12 23:34:42 -07:00
DeltaFire
9256804bd1 Unvy Ratvar 2020-11-12 21:40:32 +01:00
Artur
a4853561d3 Makes it reference the mind, not the body 2020-11-12 00:58:06 +02:00
DeltaFire
d238d235c0 Merge remote-tracking branch 'upstream/master' into clock-rite-neutering-support 2020-11-11 19:31:15 +01:00
silicons
0001a2edca Merge pull request #13669 from Arturlang/sacrifice_tweaks
Makes cult sacrifice not permakill people anymore.
2020-11-11 11:16:15 -07:00
DeltaFire
c9a5552100 support for hiding rites from neutered clockies 2020-11-10 15:36:55 +01:00
Artur
8ce058a593 Fixes stupid mistakes 2020-11-09 14:39:51 +02:00
Artur
503d0156c6 Does the thing 2020-11-08 23:24:58 +02:00
silicons
87e40f294b Merge pull request #13657 from DeltaFire15/transmission-sigil-fix
Fixes transmission sigil power drain
2020-11-07 00:30:27 -07:00
silicons
a00873a0ee Merge pull request #13658 from DeltaFire15/void-volt-tweaking
Changes to void volt and the clock power_drain() proc
2020-11-07 00:30:19 -07:00
silicons
cc56fc560e Merge pull request #13635 from Hatterhat/funny-hands-nerf
bone gauntlets bandaid nerf
2020-11-07 00:20:01 -07:00
DeltaFire
7d04d805d6 typo 2020-11-05 17:10:02 +01:00
DeltaFire
ec456dd386 changes voidvolt + power_drain
see PR desc for details
2020-11-05 16:54:35 +01:00
DeltaFire
f9122e23e1 fixes transmission sigils not draining power
if they do stuff while processing, they should probably process.
2020-11-05 13:53:27 +01:00
Hatterhat
a4196e567b i told me there'd be balance issues 2020-10-27 22:35:27 -05:00
Timothy Teakettle
4afceebcc1 critical 2020-10-20 02:11:08 +01:00
DeltaFire
fd680132ca little tweaks
reality smash: completely invisible

broken illusion: shows after some time, invisible to silicons (like cult runes and some other stuff are)
2020-10-16 21:12:27 +02:00
Sonic121x
e537828f5a Update eldritch_items.dm 2020-10-16 03:56:47 +08:00
DeltaFire
a5fce4b6ed Merge remote-tracking branch 'upstream/master' into robotic-limbs-PT2 2020-10-11 15:39:41 +02:00
silicons
8b48cab574 Merge pull request #13233 from Hatterhat/za-hando
[READY] za hando - a pr about ling claws and punching shit
2020-10-10 21:59:05 -07:00
DeltaFire
4ccf40f775 Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""
This reverts commit 27a099c6bf.
2020-10-11 00:53:18 +02:00
DeltaFire
27a099c6bf Revert "Merge branch 'master' into robotic-limbs-PT2"
This reverts commit 73b5267425, reversing
changes made to 2e780bfff2.
2020-10-11 00:51:39 +02:00
DeltaFire
73b5267425 Merge branch 'master' into robotic-limbs-PT2 2020-10-11 00:44:28 +02:00
silicons
19f1e99a8c mass ports like 15 tg prs + counting (#13386)
* changes

* ok

* changes

* sigh

* fixes

* changes

* fix

* fix

* alright

* fixes
git pus

* fix

* fix

* fix

* test

* ok

* Update code/modules/paperwork/ticketmachine.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>

* ok

* compile and other stuff

* ok

* fix

* fix

* Fix

* Update menu.dm

* Update view.dm

* Update preferences.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2020-10-10 12:20:33 +02:00
silicons
3557f00316 Merge pull request #13498 from deathride58/lingbloodupgrade
Lingblood rework (Loudness is now an average, rather than a sum)
2020-10-06 17:04:38 -07:00
DeltaFire
4146566af0 hoo boy
replaces all mentions of bodypart_robotic with is_robotic_limb() where possible, adds BODYPART_HYBRID, adds helpers for organic / robotic limbs (is_robotic_limb() / is_organic_limb(), with a arg to override it accepting hybrid limbs)
Also makes the the surgery to heal robotic limbs work if the torso isn't a robot, but rather if there are robotic bodyparts, makes the IPC brain repair.. only accept IPC brains (obviously), makes the damage threshholds for robo-limbs vars instead of a fix 25 with hybrid ones predefined at 25 / 15 (trigger / mindamage), adds an error message to fixing them if already at theshhold, etc. Now just for replacing BODYPART_ORGANIC with is_organic_limb aswell where applicable.. also actual values for the other robo limbs. Fun!
2020-10-06 17:34:13 +02:00
silicons
bbbdc57b2f Merge pull request #13483 from DeltaFire15/revenant-fix
Fixes Revenants reviving
2020-10-03 18:02:56 -07:00
silicons
20f1e0818e Merge pull request #13479 from LetterN/another-update-mayhaps
Fixes minimap, and dmdocs other things
2020-10-03 18:02:29 -07:00
silicons
73cebb3629 Merge pull request #13482 from DeltaFire15/heretic-husking-tweak
Tweaks heretic sacrifice husking
2020-10-03 14:20:58 -07:00
Letter N
09283ca485 beans 2020-10-03 13:49:20 +08:00
deathride58
cbe6178a11 reworks ling blood - loudness is now calculated via the average of your loud abilities rather than the sum 2020-10-02 19:21:30 -04:00
silicons
8b36cf6f64 Merge pull request #13375 from timothyteakettle/emp-rework
the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)
2020-10-01 03:01:18 -07:00