cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-09 23:21:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Label GS13 changes

Browse Source 
Since commit 5084020 on Jan 30, 2023
This commit is contained in:
psq95
2023-08-29 21:05:42 +01:00
parent 8e09f3b9ca
commit cb43bf0dfc
77 changed files with 253 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/spawners/lootdrop.dm
+1 -1
View File
@@ -74,7 +74,7 @@
/obj/item/cigbutt = 1,
/obj/item/trash/cheesie = 1,
/obj/item/trash/candy = 1,
/obj/item/trash/fatoray_scrap1 = 1,
/obj/item/trash/fatoray_scrap1 = 1, // GS13
/obj/item/trash/fatoray_scrap2 = 1,
/obj/item/trash/chips = 1,
/obj/item/reagent_containers/food/snacks/deadmouse = 1,
code/game/objects/items/stacks/tiles/tile_types.dm
+1 -1
View File
@@ -218,7 +218,7 @@
/obj/item/stack/tile/carpet/royalblue/fifty
amount = 50
/obj/item/stack/tile/carpet/gato/fifty
/obj/item/stack/tile/carpet/gato/fifty // GS13
amount = 50
/obj/item/stack/tile/fakespace
code/game/objects/items/stunbaton.dm
+4 -3
View File
@@ -186,9 +186,10 @@
return FALSE
stunpwr *= round(stuncharge/hitcost, 0.1)
//L.Knockdown(stunpwr) GS13 change, makes stunbatons no longer oneshot people -Eye
L.adjustStaminaLoss(stunpwr*0.5, affected_zone = (istype(user) ? user.zone_selected : BODY_ZONE_CHEST))//CIT CHANGE - makes stunbatons deal extra staminaloss. Todo: make this also deal pain when pain gets implemented.
// GS13: Make stunbatons no longer oneshot people -Eye
//L.Knockdown(stunpwr)
// CIT CHANGE - make stunbatons deal extra stamina loss. TODO: make this also deal pain when pain gets implemented.
L.adjustStaminaLoss(stunpwr*0.5, affected_zone = (istype(user) ? user.zone_selected : BODY_ZONE_CHEST))
L.apply_effect(EFFECT_STUTTER, stunforce)
SEND_SIGNAL(L, COMSIG_LIVING_MINOR_SHOCK)
if(user)