shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,314 Commits 5 Branches 0 Tags
e2fe97e86a6731fdd121caae8fb3cb192592164c
Commit Graph

1640 Commits

Author SHA1 Message Date
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
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
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
silicons
e602284bcb Merge pull request #13412 from Putnam3145/supermatter-bad 
Removed the supermatter sabotage objective; reworked non-murder MI13 objective picking.
 2020-09-27 00:09:56 -07:00
DeltaFire
d0247bdb3b modifies heretic sac husking a bit 
The husking caused by heretic sacrifices is not healable with synthflesh. In exchange, the sacrificed humanoid suffers 200 additional burn damage, making them ever so slightly harder to immediately restore.
 2020-09-27 05:35:33 +02:00
DeltaFire
29d2a12d55 fixes revenants reviving 
fix for issue #13166
 2020-09-26 16:29:11 +02:00
Timothy Teakettle
106b8ccead Merge branch 'master' into heterochromia 2020-09-24 22:09:03 +01:00
Artur
435565f1d8 Merge remote-tracking branch 'origin/master' into TGUI_Updoot 2020-09-21 00:16:12 +03:00
Putnam
63b0d61c5b Reworked the selection to scale automatically with objective counts. 2020-09-19 23:35:04 -07:00
Putnam
556a69ac78 Removed the supermatter objective; made sabotage objectives less common. 2020-09-19 22:45:32 -07:00
silicons
872ef07b43 Update brawn.dm 2020-09-17 04:36:39 -07:00
silicons
cffc321050 more 2020-09-15 17:27:50 -07:00
silicons
95ebeac5b6 fix 2020-09-15 17:27:11 -07:00
Artur
1c831692a7 Properly fixed altclick 2020-09-16 00:41:47 +03:00
silicons
563b21d8fa Merge pull request #13363 from Putnam3145/bloodsucker-ling-life-code 
Signalizes ling/bloodsucker life code.
 2020-09-11 14:15:37 -07:00
Timothy Teakettle
58737e42b9 empulse using range 2020-09-10 19:52:34 +01:00
timothyteakettle
d2f4d675a4 fuck 2020-09-10 03:55:24 +01:00
timothyteakettle
e0f44ef717 new emps 2020-09-10 03:49:47 +01:00
Timothy Teakettle
f1cd94fc97 emp rework 2020-09-09 23:14:06 +01:00
DeltaFire
c056c8ac91 boom boom 2020-09-08 20:49:24 +02:00
Putnam
c9a5a9dd8e thanks byond strings, very cool 2020-09-07 02:20:54 -07:00
Putnam
e75d1a1962 Signalizes ling/bloodsucker life code. 2020-09-07 02:00:22 -07:00
silicons
7b50b22c7b Merge pull request #13244 from lolman360/AnPrimAssistants 
Blacksmithing 2: Anarcho-Primitivist Assistants (travis don't fail on me now)
 2020-09-05 02:20:11 -07:00
silicons
e110945568 Merge pull request #13289 from kiwedespars/heretics-touchup 
heretics touchup
 2020-09-05 02:15:21 -07:00
Putnam
4ef4220c88 Completely decouples events from dynamic. 2020-09-03 16:38:16 -07:00
Artur
3bef4ba35e TGUI updates + statpanel 2020-09-02 17:52:47 +03:00
lolman360
05bd0579ca Merge remote-tracking branch 'upstream/master' into AnPrimAssistants 2020-09-01 11:23:57 +10:00
Hatterhat
b1b92c3225 runtiment 2020-08-31 14:12:10 -05:00