cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 22:42:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes blobs and other stuff (#1513)

Browse Source 
Was supposed to contain a fix for Vaurca surgery, but I decided to greenlight this ASAP once I detected a critical bug with how blobs worked.
Fixes #1509
Fixes #1470
Fixes #1506
Fixes #1501
Fixes #1484
Fixes #1466

Also replaces a lot of Vaurca checks with isvaurca() so that Shells don't start doing weird shit.
This commit is contained in:
LordFowl
2017-01-11 22:24:39 +02:00
committed by skull132
parent a6f87cbde3
commit 3cf94c66fc
17 changed files with 73 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/flash.dm
+1 -1
View File
@@ -82,7 +82,7 @@
flick("e_flash", M.flash)
//Vaurca damage 15/01/16
var/mob/living/carbon/human/H = M
if(H.species.get_bodytype() == "Vaurca")
if(isvaurca(H))
var/obj/item/organ/eyes/E = H.internal_organs_by_name["eyes"]
if(!E)
return
code/game/objects/items/weapons/grenades/flashbang.dm
+1 -1
View File
@@ -55,7 +55,7 @@
M.Weaken(10)
//Vaurca damage 15/01/16
var/mob/living/carbon/human/H = M
if(H.species.get_bodytype() == "Vaurca")
if(isvaurca(H))
var/obj/item/organ/eyes/E = H.internal_organs_by_name["eyes"]
if(!E)
return
code/game/objects/items/weapons/storage/uplink_kits.dm
+2 -2
View File
@@ -209,9 +209,9 @@
pack = new /obj/item/weapon/storage/fancy/cigarettes(src)
// Dylovene. Going with 1.5 rather than 1.6666666...
fill_cigarre_package(pack, list("potassium" = 1.5, "nitrogen" = 1.5, "silicon" = 1.5))
fill_cigarre_package(pack, list("potassium" = 1.5, "ammonia" = 1.5, "silicon" = 1.5))
// Mindbreaker
fill_cigarre_package(pack, list("silicon" = 4.5, "hydrogen" = 4.5))
fill_cigarre_package(pack, list("silicon" = 4.5, "hydrazine" = 4.5, "anti_toxin" = 4.5))
pack.desc += " 'MB' has been scribbled on it."