shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MIRROR] Fixes bloodpack sprite issues (#5333)

Browse Source 
* Fixes bloodpack sprite issues

* Update packs.dm

* fuck this godamn map
This commit is contained in:
CitadelStationBot
2018-02-06 18:24:51 -06:00
committed by Poojawa
parent 730580efeb
commit b6c4bd6e01
9 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomZLevels/snowdin.dmm
+3 -3
View File
@@ -2017,8 +2017,8 @@
"eX" = (
/obj/structure/closet/crate/freezer,
/obj/item/reagent_containers/blood/random,
/obj/item/reagent_containers/blood/empty,
/obj/item/reagent_containers/blood/empty,
/obj/item/reagent_containers/blood,
/obj/item/reagent_containers/blood,
/turf/open/floor/plasteel/cmo,
/area/awaymission/snowdin/post)
"eY" = (
@@ -2207,7 +2207,7 @@
/turf/open/floor/plasteel/cmo,
/area/awaymission/snowdin/post)
"fx" = (
/obj/item/reagent_containers/blood/empty,
/obj/item/reagent_containers/blood,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
piping_layer = 3;
pixel_x = 5;
_maps/map_files/BoxStation/BoxStation.dmm
+3 -3
View File
@@ -3032,7 +3032,7 @@
dir = 4
},
/obj/machinery/iv_drip,
/obj/item/reagent_containers/blood/empty,
/obj/item/reagent_containers/blood,
/turf/open/floor/plasteel/whitered/side{
dir = 5
},
@@ -51887,8 +51887,8 @@
/area/quartermaster/storage)
"cCp" = (
/obj/structure/closet/crate/freezer,
/obj/item/reagent_containers/blood/empty,
/obj/item/reagent_containers/blood/empty,
/obj/item/reagent_containers/blood,
/obj/item/reagent_containers/blood,
/obj/item/reagent_containers/blood/AMinus,
/obj/item/reagent_containers/blood/BMinus{
pixel_x = -4;
_maps/map_files/MetaStation/MetaStation.dmm
+6 -6
View File
@@ -56418,11 +56418,11 @@
},
/obj/item/reagent_containers/blood/random,
/obj/item/reagent_containers/blood/random,
/obj/item/reagent_containers/blood/empty{
/obj/item/reagent_containers/blood{
pixel_x = -3;
pixel_y = -3
},
/obj/item/reagent_containers/blood/empty{
/obj/item/reagent_containers/blood{
pixel_x = -3;
pixel_y = -3
},
@@ -66149,8 +66149,8 @@
pixel_x = 8;
pixel_y = 2
},
/obj/item/reagent_containers/blood/empty,
/obj/item/reagent_containers/blood/empty,
/obj/item/reagent_containers/blood,
/obj/item/reagent_containers/blood,
/obj/item/reagent_containers/syringe,
/obj/item/reagent_containers/dropper,
/obj/structure/sign/warning/biohazard{
@@ -66543,8 +66543,8 @@
/area/medical/virology)
"cIu" = (
/obj/structure/closet/crate/freezer,
/obj/item/reagent_containers/blood/empty,
/obj/item/reagent_containers/blood/empty{
/obj/item/reagent_containers/blood,
/obj/item/reagent_containers/blood{
pixel_x = -3;
pixel_y = -3
},
_maps/map_files/Mining/Lavaland.dmm
+2 -2
View File
@@ -1216,8 +1216,8 @@
/area/mine/maintenance)
"dB" = (
/obj/structure/closet/crate/freezer,
/obj/item/reagent_containers/blood/empty,
/obj/item/reagent_containers/blood/empty{
/obj/item/reagent_containers/blood,
/obj/item/reagent_containers/blood{
pixel_x = -3;
pixel_y = -3
},
_maps/shuttles/emergency_cere.dmm
+2 -2
View File
@@ -879,8 +879,8 @@
/area/shuttle/escape)
"cE" = (
/obj/structure/closet/crate/freezer,
/obj/item/reagent_containers/blood/empty,
/obj/item/reagent_containers/blood/empty,
/obj/item/reagent_containers/blood,
/obj/item/reagent_containers/blood,
/obj/item/reagent_containers/blood/AMinus,
/obj/item/reagent_containers/blood/BMinus{
pixel_x = -4;
_maps/shuttles/whiteship_meta.dmm
+1 -1
View File
@@ -1288,7 +1288,7 @@
/area/shuttle/abandoned)
"cl" = (
/obj/structure/closet/crate/freezer,
/obj/item/reagent_containers/blood/empty{
/obj/item/reagent_containers/blood{
pixel_x = -3;
pixel_y = -3
},
code/game/objects/structures/crates_lockers/crates.dm
+2 -2
View File
@@ -87,8 +87,8 @@
/obj/structure/closet/crate/freezer/blood/PopulateContents()
. = ..()
new /obj/item/reagent_containers/blood/empty(src)
new /obj/item/reagent_containers/blood/empty(src)
new /obj/item/reagent_containers/blood(src)
new /obj/item/reagent_containers/blood(src)
new /obj/item/reagent_containers/blood/AMinus(src)
new /obj/item/reagent_containers/blood/BMinus(src)
new /obj/item/reagent_containers/blood/BPlus(src)
code/modules/cargo/packs.dm
+2 -2
View File
@@ -825,8 +825,8 @@
/datum/supply_pack/medical/bloodpacks
name = "Blood Pack Variety Crate"
cost = 3500
contains = list(/obj/item/reagent_containers/blood/empty,
/obj/item/reagent_containers/blood/empty,
contains = list(/obj/item/reagent_containers/blood,
/obj/item/reagent_containers/blood,
/obj/item/reagent_containers/blood/APlus,
/obj/item/reagent_containers/blood/AMinus,
/obj/item/reagent_containers/blood/BPlus,
code/modules/reagents/reagent_containers/blood_pack.dm
+2 -5
View File
@@ -44,8 +44,9 @@
icon_state = "random_bloodpack"
/obj/item/reagent_containers/blood/random/Initialize()
icon_state = "bloodpack"
blood_type = pick("A+", "A-", "B+", "B-", "O+", "O-", "L")
. = ..()
return ..()
/obj/item/reagent_containers/blood/APlus
blood_type = "A+"
@@ -71,10 +72,6 @@
/obj/item/reagent_containers/blood/universal
blood_type = "U"
/obj/item/reagent_containers/blood/empty
name = "blood pack"
icon_state = "empty"
/obj/item/reagent_containers/blood/attackby(obj/item/I, mob/user, params)
if (istype(I, /obj/item/pen) || istype(I, /obj/item/toy/crayon))