diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 3b9a3eb0671..90ae96299d3 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -4881,7 +4881,7 @@ "bPS" = (/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/structure/cable,/obj/item/roller,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/genetics_cloning) "bPT" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor{icon_state = "white"},/area/medical/genetics_cloning) "bPU" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/item/device/radio/intercom{freerange = 1; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 30},/turf/simulated/floor{icon_state = "white"},/area/medical/genetics_cloning) -"bPV" = (/obj/machinery/light{dir = 8},/obj/item/device/radio/intercom{dir = 0; name = "Station Intercom (General)"; pixel_x = -27},/obj/item/weapon/storage/box/monkeycubes,/obj/item/weapon/storage/box/stokcubes,/obj/item/weapon/storage/box/neaeracubes,/obj/structure/table/glass,/obj/item/weapon/storage/box/farwacubes,/turf/simulated/floor{tag = "icon-whitepurple (WEST)"; icon_state = "whitepurple"; dir = 8},/area/medical/genetics) +"bPV" = (/obj/machinery/light{dir = 8},/obj/item/device/radio/intercom{dir = 0; name = "Station Intercom (General)"; pixel_x = -27},/obj/item/weapon/storage/box/monkeycubes,/obj/item/weapon/storage/box/stokcubes,/obj/item/weapon/storage/box/neaeracubes,/obj/structure/table/glass,/obj/item/weapon/storage/box/wolpincubes,/obj/item/weapon/storage/box/farwacubes,/turf/simulated/floor{tag = "icon-whitepurple (WEST)"; icon_state = "whitepurple"; dir = 8},/area/medical/genetics) "bPW" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/item/roller,/obj/item/weapon/storage/box/disks,/obj/structure/table/glass,/turf/simulated/floor{tag = "icon-whitepurple (EAST)"; icon_state = "whitepurple"; dir = 4},/area/medical/genetics) "bPX" = (/turf/simulated/wall/r_wall,/area/toxins/server_coldroom) "bPY" = (/obj/machinery/door/firedoor{dir = 1; name = "hazard door north"},/obj/machinery/door/airlock/command{name = "Server Room"; req_access = null; req_access_txt = "30"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor{icon_state = "dark"},/area/toxins/server) @@ -7465,7 +7465,7 @@ "cNC" = (/obj/item/weapon/storage/fancy/vials,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/table/glass,/turf/simulated/floor{icon_state = "white"},/area/medical/virology/lab) "cND" = (/obj/item/weapon/storage/lockbox/vials,/obj/structure/table/glass,/turf/simulated/floor{icon_state = "white"},/area/medical/virology/lab) "cNE" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/medical/virology/lab) -"cNF" = (/obj/item/weapon/storage/box/monkeycubes,/obj/item/weapon/storage/box/stokcubes,/obj/item/weapon/storage/box/neaeracubes,/obj/structure/table/glass,/obj/item/weapon/storage/box/farwacubes,/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor{icon_state = "white"},/area/medical/virology/lab) +"cNF" = (/obj/item/weapon/storage/box/monkeycubes,/obj/item/weapon/storage/box/stokcubes,/obj/item/weapon/storage/box/neaeracubes,/obj/structure/table/glass,/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/obj/item/weapon/storage/box/wolpincubes,/obj/item/weapon/storage/box/farwacubes,/turf/simulated/floor{icon_state = "white"},/area/medical/virology/lab) "cNG" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = -28},/obj/machinery/light,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/virology/lab) "cNH" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/machinery/camera{c_tag = "Virology Lab East"; dir = 1; network = list("SS13")},/turf/simulated/floor{icon_state = "white"},/area/medical/virology/lab) "cNI" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "Biohazard_medi"; name = "Quarantine Lockdown"; opacity = 0},/turf/simulated/floor/plating,/area/medical/virology/lab) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index d7dfd29644d..0002ce9f496 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -799,13 +799,13 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine cost = 30 containername = "farwa crate" -/* + /datum/supply_packs/organic/wolpin name = "Wolpin crate" contains = list (/obj/item/weapon/storage/box/wolpincubes) cost = 30 containername = "wolpin crate" -*/ + /datum/supply_packs/organic/skrell name = "Neaera crate" diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 313550779ce..65ebe415ada 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -411,7 +411,7 @@ for(var/i = 1; i <= 5; i++) new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/neaeracube(src) -/* + /obj/item/weapon/storage/box/wolpincubes name = "wolpin cube box" desc = "Drymate brand wolpin cubes. Just add water!" @@ -423,7 +423,7 @@ ..() for(var/i = 1; i <= 5; i++) new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/wolpincube(src) -*/ + /obj/item/weapon/storage/box/permits name = "box of construction permits" diff --git a/code/modules/mob/language.dm b/code/modules/mob/language.dm index ce69eafc411..475adb6ef6f 100644 --- a/code/modules/mob/language.dm +++ b/code/modules/mob/language.dm @@ -593,5 +593,11 @@ desc = "Meow meow meow." key = "fa" +/datum/language/vulpkanin/monkey + name = "Wolpin" + desc = "Bark bark barl." + key = "vu" + + #undef SCRAMBLE_CACHE_LEN diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 79e45f39cee..76941f757db 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -128,6 +128,9 @@ /mob/living/carbon/human/farwa/New(var/new_loc) ..(new_loc, "Farwa") +/mob/living/carbon/human/wolpin/New(var/new_loc) + ..(new_loc, "Wolpin") + /mob/living/carbon/human/neara/New(var/new_loc) ..(new_loc, "Neara") diff --git a/code/modules/mob/living/carbon/human/species/monkey.dm b/code/modules/mob/living/carbon/human/species/monkey.dm index 58990646823..5a2446f6e2f 100644 --- a/code/modules/mob/living/carbon/human/species/monkey.dm +++ b/code/modules/mob/living/carbon/human/species/monkey.dm @@ -18,6 +18,7 @@ eyes = "blank_eyes" tail = "chimptail" + bodyflags = FEET_PADDED | HAS_TAIL //unarmed_types = list(/datum/unarmed_attack/bite, /datum/unarmed_attack/claws) //inherent_verbs = list(/mob/living/proc/ventcrawl) @@ -60,6 +61,20 @@ datum/species/monkey/get_random_name(var/gender) base_color = "#333333" tail = "farwatail" + +/datum/species/monkey/vulpkanin + name = "Wolpin" + + icobase = 'icons/mob/human_races/monkeys/r_wolpin.dmi' + deform = 'icons/mob/human_races/monkeys/r_wolpin.dmi' + + greater_form = "Vulpkanin" + default_language = "Wolpin" + flesh_color = "#966464" + base_color = "#BE8264" + tail = "wolpintail" + + /datum/species/monkey/skrell name = "Neara" @@ -73,6 +88,9 @@ datum/species/monkey/get_random_name(var/gender) reagent_tag = IS_SKRELL tail = null + bodyflags = FEET_PADDED + + /datum/species/monkey/unathi name = "Stok" @@ -85,3 +103,5 @@ datum/species/monkey/get_random_name(var/gender) flesh_color = "#34AF10" base_color = "#066000" reagent_tag = IS_UNATHI + + bodyflags = FEET_CLAWS | HAS_TAIL diff --git a/code/modules/mob/living/carbon/human/species/station.dm b/code/modules/mob/living/carbon/human/species/station.dm index 02468e8c8ab..cfe4d3eea09 100644 --- a/code/modules/mob/living/carbon/human/species/station.dm +++ b/code/modules/mob/living/carbon/human/species/station.dm @@ -101,6 +101,7 @@ path = /mob/living/carbon/human/vulpkanin default_language = "Galactic Common" language = "Canilunzt" + primitive_form = "Wolpin" tail = "vulptail" unarmed_type = /datum/unarmed_attack/claws darksight = 8 diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index c199844a083..28df860f078 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -1754,14 +1754,14 @@ name = "farwa cube" monkey_type = "Farwa" -/* + /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wolpincube name = "wolpin cube" - monkey_type = /mob/living/carbon/monkey/vulpkanin + monkey_type = "Wolpin" /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/wolpincube name = "wolpin cube" - monkey_type = /mob/living/carbon/monkey/vulpkanin -*/ + monkey_type = "Wolpin" + /obj/item/weapon/reagent_containers/food/snacks/monkeycube/stokcube name = "stok cube" diff --git a/icons/effects/species.dmi b/icons/effects/species.dmi index 3124b463c77..f057ac2ba40 100644 Binary files a/icons/effects/species.dmi and b/icons/effects/species.dmi differ diff --git a/icons/mob/human_races/monkeys/r_wolpin.dmi b/icons/mob/human_races/monkeys/r_wolpin.dmi new file mode 100644 index 00000000000..2706d5c9c7e Binary files /dev/null and b/icons/mob/human_races/monkeys/r_wolpin.dmi differ