cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 05:30:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Semi-Modular] Synthetic Rebalance III: A Rope of Sand (#10821)

Browse Source 
* upgradespeopleupgrades

* yeah

* weldingmoment

* Apply suggestions from code review

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

* love death and robots

* modularity i guess who knows

* Apply suggestions from code review

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* wew

* literally just kill me

* satisfaction

* i hate synths

* Fixing the commented code

* Update code/modules/surgery/healing.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* whew

* Update modular_skyrat/master_files/code/modules/power/cable.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update modular_skyrat/master_files/code/game/objects/items/tools/weldingtool.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* wew

* Update code/__DEFINES/~skyrat_defines/mobs.dm

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

* Should hopefully actually fix the logic for the synth revival surgery

* Update modular_skyrat/modules/customization/modules/mob/living/carbon/human/human_defense.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* uwu

Co-authored-by: Snakebittenn <12636964+Snakebittenn@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
This commit is contained in:
Nerevar
2022-02-16 16:51:40 +00:00
committed by GitHub
co-authored by Tom GoldenAlpharex Snakebittenn GoldenAlpharex
parent f12dcc286f
commit 85fed784da
14 changed files with 139 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/tools/weldingtool.dm
+6
View File
@@ -126,8 +126,14 @@
if(user == attacked_humanoid)
user.visible_message(span_notice("[user] starts to fix some of the dents on [attacked_humanoid]'s [affecting.name]."),
span_notice("You start fixing some of the dents on [attacked_humanoid == user ? "your" : "[attacked_humanoid]'s"] [affecting.name]."))
/* SKYRAT EDIT START - ORIGINAL:
if(!do_mob(user, attacked_humanoid, 50))
return
*/
// SKYRAT EDIT CHANGE START
if(!do_after(user, (user == attacked_humanoid ? self_delay : other_delay)))
return
// SKYRAT EDIT CHANGE END
item_heal_robotic(attacked_humanoid, user, 15, 0)
else
return ..()