Merge remote-tracking branch 'upstream/master'
This commit is contained in:
keronshb
@@ -1001,6 +1001,20 @@
|
||||
/obj/item/clothing/glasses/heat,
|
||||
/turf/open/floor/plating/beach/sand,
|
||||
/area/awaymission/beach)
|
||||
"np" = (
|
||||
/obj/machinery/shower{
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/turf_decal/sand,
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/awaymission/beach)
|
||||
"Vi" = (
|
||||
/obj/machinery/shower{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/turf_decal/sand,
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/awaymission/beach)
|
||||
|
||||
(1,1,1) = {"
|
||||
aa
|
||||
@@ -7892,10 +7906,10 @@ ak
|
||||
ak
|
||||
ak
|
||||
ak
|
||||
ak
|
||||
ak
|
||||
ak
|
||||
ak
|
||||
Vi
|
||||
Vi
|
||||
Vi
|
||||
Vi
|
||||
ak
|
||||
ba
|
||||
ba
|
||||
@@ -8213,10 +8227,10 @@ ak
|
||||
ak
|
||||
ak
|
||||
ak
|
||||
ak
|
||||
ak
|
||||
ak
|
||||
ak
|
||||
np
|
||||
np
|
||||
np
|
||||
np
|
||||
ak
|
||||
ba
|
||||
ba
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -40675,6 +40675,7 @@
|
||||
/obj/machinery/light/small{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/space_heater,
|
||||
/turf/open/floor/plating{
|
||||
icon_state = "platingdmg3"
|
||||
},
|
||||
@@ -45447,15 +45448,15 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/turf_decal/stripes/corner{
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/turf_decal/tile/yellow{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/turf_decal/tile/yellow{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/turf_decal/stripes/corner{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/engineering/main)
|
||||
"bYS" = (
|
||||
@@ -45468,15 +45469,15 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/turf_decal/tile/yellow{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/turf_decal/tile/yellow{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/engineering/main)
|
||||
"bYT" = (
|
||||
@@ -45492,15 +45493,15 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/turf_decal/tile/yellow{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/turf_decal/tile/yellow{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/cable{
|
||||
icon_state = "1-2"
|
||||
},
|
||||
@@ -45520,15 +45521,15 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/turf_decal/tile/yellow{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/turf_decal/tile/yellow{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/engineering/main)
|
||||
"bYV" = (
|
||||
@@ -45539,6 +45540,12 @@
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
|
||||
/obj/effect/turf_decal/tile/yellow{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/turf_decal/tile/yellow{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 1
|
||||
},
|
||||
@@ -45551,15 +45558,15 @@
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/turf_decal/tile/yellow{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/turf_decal/tile/yellow{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
|
||||
dir = 4
|
||||
},
|
||||
@@ -45578,15 +45585,15 @@
|
||||
/obj/machinery/firealarm{
|
||||
pixel_y = 29
|
||||
},
|
||||
/obj/effect/turf_decal/stripes/corner{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/turf_decal/tile/yellow{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/turf_decal/tile/yellow{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/turf_decal/stripes/corner{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/engineering/main)
|
||||
"bYY" = (
|
||||
@@ -47272,6 +47279,10 @@
|
||||
dir = 4;
|
||||
light_color = "#e8eaff"
|
||||
},
|
||||
/obj/machinery/airalarm{
|
||||
dir = 8;
|
||||
pixel_x = 22
|
||||
},
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/engineering/main)
|
||||
"cfk" = (
|
||||
@@ -53466,10 +53477,6 @@
|
||||
},
|
||||
/area/maintenance/department/engine)
|
||||
"dEy" = (
|
||||
/obj/machinery/airalarm{
|
||||
dir = 1;
|
||||
pixel_y = -22
|
||||
},
|
||||
/obj/structure/reflector/double/anchored{
|
||||
dir = 9
|
||||
},
|
||||
@@ -55355,6 +55362,10 @@
|
||||
/obj/machinery/power/rad_collector/anchored,
|
||||
/turf/open/floor/engine,
|
||||
/area/engineering/supermatter)
|
||||
"hKX" = (
|
||||
/obj/machinery/space_heater,
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/department/security/brig)
|
||||
"hMx" = (
|
||||
/obj/machinery/atmospherics/components/unary/portables_connector/visible,
|
||||
/turf/open/floor/plating{
|
||||
@@ -60884,6 +60895,10 @@
|
||||
/obj/item/pen,
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/science/explab)
|
||||
"tCJ" = (
|
||||
/obj/machinery/space_heater,
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/department/crew_quarters/bar)
|
||||
"tCP" = (
|
||||
/obj/docking_port/stationary/public_mining_dock,
|
||||
/turf/open/floor/plating,
|
||||
@@ -80222,7 +80237,7 @@ aiu
|
||||
xuv
|
||||
aoe
|
||||
ajD
|
||||
ajD
|
||||
hKX
|
||||
aiu
|
||||
apB
|
||||
aiu
|
||||
@@ -91030,7 +91045,7 @@ aKT
|
||||
aLH
|
||||
aNf
|
||||
aKT
|
||||
aLL
|
||||
tCJ
|
||||
aQO
|
||||
aRO
|
||||
aSH
|
||||
@@ -99781,7 +99796,7 @@ aPY
|
||||
bau
|
||||
aLf
|
||||
aFi
|
||||
aFi
|
||||
aMA
|
||||
beI
|
||||
beI
|
||||
bgD
|
||||
@@ -107236,7 +107251,7 @@ aaa
|
||||
aEl
|
||||
aTx
|
||||
aFi
|
||||
aFi
|
||||
aMA
|
||||
aEj
|
||||
bhz
|
||||
lEn
|
||||
|
||||
@@ -59,7 +59,7 @@
|
||||
#define LOADOUT_CATEGORY_UNLOCKABLE "Unlockable"
|
||||
|
||||
//how many prosthetics can we have
|
||||
#define MAXIMUM_LOADOUT_PROSTHETICS 2
|
||||
#define MAXIMUM_LOADOUT_PROSTHETICS 4
|
||||
|
||||
//what limbs can be amputated or be prosthetic
|
||||
#define LOADOUT_ALLOWED_LIMB_TARGETS list(BODY_ZONE_L_ARM,BODY_ZONE_R_ARM,BODY_ZONE_L_LEG,BODY_ZONE_R_LEG)
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
//This file is for crafting using a lens!
|
||||
|
||||
/obj/item/glasswork/glass_base/lens
|
||||
name = "Optical lens"
|
||||
desc = "Good for selling or crafting, by itself its useless"
|
||||
name = "optical lens"
|
||||
desc = "A glass lens. Useless by itself, but may prove useful in making something with a focus."
|
||||
icon = 'icons/obj/glass_ware.dmi'
|
||||
icon_state = "glass_optics"
|
||||
|
||||
//Laser pointers - 2600
|
||||
/obj/item/glasswork/glass_base/laserpointer_shell
|
||||
name = "Laser pointer assembly"
|
||||
desc = "Good for selling or crafting, by itself its useless. Needs a power capactor."
|
||||
name = "laser pointer assembly"
|
||||
desc = "An empty hull of a laser pointer. It's missing a capacitor."
|
||||
icon_state = "laser_case"
|
||||
icon = 'icons/obj/glass_ware.dmi'
|
||||
next_step = /obj/item/glasswork/glass_base/laserpointer_shell_1
|
||||
@@ -21,8 +21,8 @@
|
||||
qdel(src)
|
||||
|
||||
/obj/item/glasswork/glass_base/laserpointer_shell_1
|
||||
name = "Laser pointer assembly"
|
||||
desc = "Good for selling or crafting, by itself its useless. Needs a glass lens."
|
||||
name = "powered laser pointer assembly"
|
||||
desc = "A laser pointer hull with a capacitor inside of it. It's missing a lens."
|
||||
icon_state = "laser_wire"
|
||||
icon_state = "laser_case"
|
||||
next_step = /obj/item/glasswork/glass_base/laserpointer_shell_2
|
||||
@@ -34,8 +34,8 @@
|
||||
qdel(src)
|
||||
|
||||
/obj/item/glasswork/glass_base/laserpointer_shell_2
|
||||
name = "Laser pointer assembly"
|
||||
desc = "Good for selling or crafting, by itself its useless. Needs to be screwed together."
|
||||
name = "near-complete laser pointer assembly"
|
||||
desc = "A laser pointer hull with a capacitor and a lens inside of it. It needs to be screwed together."
|
||||
icon_state = "laser_wire"
|
||||
icon_state = "laser_case"
|
||||
next_step = /obj/item/laser_pointer/blue/handmade
|
||||
@@ -50,8 +50,8 @@
|
||||
//NERD SHIT - 5000
|
||||
|
||||
/obj/item/glasswork/glass_base/glasses_frame
|
||||
name = "Glasses Frame"
|
||||
desc = "Good for crafting a pare of glasses, by itself its useless. Just add a pare of lens."
|
||||
name = "glasses frame"
|
||||
desc = "A pair of glasses without the lenses. You could probably add them yourself, though."
|
||||
icon = 'icons/obj/glass_ware.dmi'
|
||||
icon_state = "frames"
|
||||
next_step = /obj/item/glasswork/glass_base/glasses_frame_1
|
||||
@@ -64,8 +64,8 @@
|
||||
qdel(src)
|
||||
|
||||
/obj/item/glasswork/glass_base/glasses_frame_1
|
||||
name = "Glasses Frame"
|
||||
desc = "Good for crafting a pare of glasses, by itself its useless. Just add a the other lens."
|
||||
name = "glasses frame"
|
||||
desc = "A pair of shoddily-assembled glasses with only one lens. You could probably add the second one yourself, though."
|
||||
icon = 'icons/obj/glass_ware.dmi'
|
||||
icon_state = "frames_1"
|
||||
next_step = /obj/item/glasswork/glass_base/glasses_frame_2
|
||||
@@ -78,8 +78,8 @@
|
||||
qdel(src)
|
||||
|
||||
/obj/item/glasswork/glass_base/glasses_frame_2
|
||||
name = "Glasses Frame"
|
||||
desc = "Good for crafting a pare of glasses, by itself its useless. Just adjust the pices into the frame with a screwdriver."
|
||||
name = "glasses frame"
|
||||
desc = "A pair of hastily-assembled unfitted glasses with both lenses intact. Use a screwdriver to fit them."
|
||||
icon = 'icons/obj/glass_ware.dmi'
|
||||
icon_state = "frames_2"
|
||||
next_step = /obj/item/glasswork/glasses
|
||||
@@ -92,7 +92,7 @@
|
||||
qdel(src)
|
||||
|
||||
/obj/item/glasswork/glasses
|
||||
name = "Handmade Glasses"
|
||||
desc = "Handmade glasses that have not been polished at all making them useless. Selling them could still be worth a few credits."
|
||||
name = "handmade glasses"
|
||||
desc = "A pair of poorly-assembled glasses clearly produced by someone with no qualifications in making glasses. They're smudged, ugly, and don't even fit you. They might be worth some money, though."
|
||||
icon = 'icons/obj/glass_ware.dmi'
|
||||
icon_state = "frames_2"
|
||||
|
||||
@@ -172,15 +172,13 @@ GLOBAL_LIST_EMPTY(gateway_destinations)
|
||||
/// bumper object, the thing that starts actual teleport
|
||||
var/obj/effect/gateway_portal_bumper/portal
|
||||
/// Visual object for handling the viscontents
|
||||
/// DISABLED DUE TO BYOND BUG CAUSING STACK OVERFLOWS OF ANY HUMAN INSTANTIATION NEAR AN ACTIVATED GATEWAY.
|
||||
/// Probably due to it referencing each other through the gateway (there's a deep loop, maybe BYOND isn't catching something when it usually would)
|
||||
// var/obj/effect/gateway_portal_effect/portal_visuals
|
||||
var/obj/effect/gateway_portal_effect/portal_visuals
|
||||
|
||||
/obj/machinery/gateway/Initialize()
|
||||
generate_destination()
|
||||
update_icon()
|
||||
// portal_visuals = new
|
||||
// vis_contents += portal_visuals
|
||||
portal_visuals = new
|
||||
vis_contents += portal_visuals
|
||||
return ..()
|
||||
|
||||
/obj/machinery/gateway/proc/generate_destination()
|
||||
@@ -197,7 +195,7 @@ GLOBAL_LIST_EMPTY(gateway_destinations)
|
||||
if(use_power == ACTIVE_POWER_USE)
|
||||
use_power = IDLE_POWER_USE
|
||||
update_icon()
|
||||
// portal_visuals.reset_visuals()
|
||||
portal_visuals.reset_visuals()
|
||||
|
||||
/obj/machinery/gateway/process()
|
||||
if((stat & (NOPOWER)) && use_power)
|
||||
@@ -205,12 +203,6 @@ GLOBAL_LIST_EMPTY(gateway_destinations)
|
||||
deactivate()
|
||||
return
|
||||
|
||||
/obj/machinery/gateway/update_icon_state()
|
||||
if(target)
|
||||
icon_state = "on_old"
|
||||
else
|
||||
icon_state = "portal_frame"
|
||||
|
||||
/obj/machinery/gateway/safe_throw_at(atom/target, range, speed, mob/thrower, spin = TRUE, diagonals_first = FALSE, datum/callback/callback, force = MOVE_FORCE_STRONG, gentle = FALSE)
|
||||
return
|
||||
|
||||
@@ -223,7 +215,7 @@ GLOBAL_LIST_EMPTY(gateway_destinations)
|
||||
return
|
||||
target = D
|
||||
target.activate(destination)
|
||||
// portal_visuals.setup_visuals(target)
|
||||
portal_visuals.setup_visuals(target)
|
||||
generate_bumper()
|
||||
use_power = ACTIVE_POWER_USE
|
||||
update_icon()
|
||||
@@ -365,6 +357,8 @@ GLOBAL_LIST_EMPTY(gateway_destinations)
|
||||
|
||||
animate(get_filter("portal_ripple"), time = 1.3 SECONDS, loop = -1, easing = LINEAR_EASING, radius = 32)
|
||||
|
||||
var/turf/center_turf = our_destination.get_target_turf()
|
||||
/// DISABLED DUE TO BYOND BUG CAUSING STACK OVERFLOWS OF ANY HUMAN INSTANTIATION NEAR AN ACTIVATED GATEWAY.
|
||||
/// Probably due to it referencing each other through the gateway (there's a deep loop, maybe BYOND isn't catching something when it usually would)
|
||||
//var/turf/center_turf = our_destination.get_target_turf()
|
||||
|
||||
vis_contents += block(locate(center_turf.x - 1, center_turf.y - 1, center_turf.z), locate(center_turf.x + 1, center_turf.y + 1, center_turf.z))
|
||||
//vis_contents += block(locate(center_turf.x - 1, center_turf.y - 1, center_turf.z), locate(center_turf.x + 1, center_turf.y + 1, center_turf.z))
|
||||
|
||||
@@ -497,6 +497,72 @@
|
||||
/obj/item/reagent_containers/food/drinks/bottle/grenadine/empty
|
||||
list_reagents = null
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/blank //Don't let players print these from a lathe, bottles should be obtained in mass from the bar only.
|
||||
name = "glass bottle"
|
||||
desc = "This blank bottle is unyieldingly anonymous, offering no clues to it's contents."
|
||||
icon_state = "glassbottle"
|
||||
volume = 90
|
||||
spillable = TRUE
|
||||
obj_flags = UNIQUE_RENAME
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/blank/update_icon()
|
||||
..()
|
||||
add_overlay("[initial(icon_state)]shine")
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/blank/Initialize()
|
||||
. = ..()
|
||||
update_icon()
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/blank/get_part_rating()
|
||||
return reagents.maximum_volume
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/blank/on_reagent_change(changetype)
|
||||
update_icon()
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/blank/update_overlays()
|
||||
. = ..()
|
||||
if(!cached_icon)
|
||||
cached_icon = icon_state
|
||||
|
||||
if(reagents.total_volume)
|
||||
var/mutable_appearance/filling = mutable_appearance('icons/obj/reagentfillings.dmi', "[cached_icon]10", color = mix_color_from_reagents(reagents.reagent_list))
|
||||
|
||||
var/percent = round((reagents.total_volume / volume) * 100)
|
||||
switch(percent)
|
||||
if(0 to 9)
|
||||
filling.icon_state = "[cached_icon]0"
|
||||
if(10 to 19)
|
||||
filling.icon_state = "[cached_icon]10"
|
||||
if(20 to 29)
|
||||
filling.icon_state = "[cached_icon]20"
|
||||
if(30 to 39)
|
||||
filling.icon_state = "[cached_icon]30"
|
||||
if(40 to 49)
|
||||
filling.icon_state = "[cached_icon]40"
|
||||
if(50 to 59)
|
||||
filling.icon_state = "[cached_icon]50"
|
||||
if(60 to 69)
|
||||
filling.icon_state = "[cached_icon]60"
|
||||
if(70 to 79)
|
||||
filling.icon_state = "[cached_icon]70"
|
||||
if(80 to 89)
|
||||
filling.icon_state = "[cached_icon]80"
|
||||
if(90 to INFINITY)
|
||||
filling.icon_state = "[cached_icon]90"
|
||||
. += filling
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/blank/small
|
||||
name = "small glass bottle"
|
||||
desc = "This small bottle is unyieldingly anonymous, offering no clues to it's contents."
|
||||
icon_state = "glassbottlesmall"
|
||||
volume = 60
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/bottle/blank/pitcher
|
||||
name = "glass pitcher"
|
||||
desc = "This is a pitcher for large amounts of liquid of any kind."
|
||||
icon_state = "unipitcher"
|
||||
volume = 120
|
||||
|
||||
////////////////////////// MOLOTOV ///////////////////////
|
||||
/obj/item/reagent_containers/food/drinks/bottle/molotov
|
||||
name = "molotov cocktail"
|
||||
|
||||
@@ -436,13 +436,27 @@
|
||||
|
||||
/datum/sprite_accessory/tails/human/shark
|
||||
name = "Shark"
|
||||
icon_state = "shark"
|
||||
icon_state = "carp"
|
||||
color_src = MATRIXED
|
||||
icon = 'modular_citadel/icons/mob/mam_tails.dmi'
|
||||
matrixed_sections = MATRIX_RED
|
||||
|
||||
/datum/sprite_accessory/tails_animated/human/shark
|
||||
name = "Shark"
|
||||
icon_state = "carp"
|
||||
color_src = MATRIXED
|
||||
icon = 'modular_citadel/icons/mob/mam_tails.dmi'
|
||||
matrixed_sections = MATRIX_RED
|
||||
|
||||
/datum/sprite_accessory/tails/human/sharkalt
|
||||
name = "Shark (alt)"
|
||||
icon_state = "shark"
|
||||
color_src = MATRIXED
|
||||
icon = 'modular_citadel/icons/mob/mam_tails.dmi'
|
||||
matrixed_sections = MATRIX_RED
|
||||
|
||||
/datum/sprite_accessory/tails_animated/human/sharkalt
|
||||
name = "Shark (alt)"
|
||||
icon_state = "shark"
|
||||
color_src = MATRIXED
|
||||
icon = 'modular_citadel/icons/mob/mam_tails.dmi'
|
||||
@@ -897,11 +911,21 @@
|
||||
|
||||
/datum/sprite_accessory/tails/mam_tails/shark
|
||||
name = "Shark"
|
||||
icon_state = "shark"
|
||||
icon_state = "carp"
|
||||
matrixed_sections = MATRIX_RED
|
||||
|
||||
/datum/sprite_accessory/tails_animated/mam_tails_animated/shark
|
||||
name = "Shark"
|
||||
icon_state = "carp"
|
||||
matrixed_sections = MATRIX_RED
|
||||
|
||||
/datum/sprite_accessory/tails/mam_tails/sharkalt
|
||||
name = "Shark (alt)"
|
||||
icon_state = "shark"
|
||||
matrixed_sections = MATRIX_RED
|
||||
|
||||
/datum/sprite_accessory/tails_animated/mam_tails_animated/sharkalt
|
||||
name = "Shark (alt)"
|
||||
icon_state = "shark"
|
||||
matrixed_sections = MATRIX_RED
|
||||
|
||||
|
||||
@@ -245,6 +245,36 @@
|
||||
category = list("Equipment")
|
||||
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
|
||||
|
||||
/datum/design/emptybottle
|
||||
name = "Glass Bottle"
|
||||
desc = "A small, empty bottle for storing liquids."
|
||||
id = "emptyglassbottle"
|
||||
build_type = PROTOLATHE
|
||||
materials = list(/datum/material/glass = 400)
|
||||
build_path = /obj/item/reagent_containers/food/drinks/bottle/blank/small
|
||||
category = list("Equipment")
|
||||
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
|
||||
|
||||
/datum/design/largeemptybottle
|
||||
name = "Large Glass Bottle"
|
||||
desc = "A large, empty bottle for storing liquids."
|
||||
id = "largeemptyglassbottle"
|
||||
build_type = PROTOLATHE
|
||||
materials = list(/datum/material/glass = 2000)
|
||||
build_path = /obj/item/reagent_containers/food/drinks/bottle/blank
|
||||
category = list("Equipment")
|
||||
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
|
||||
|
||||
/datum/design/emptypitcher
|
||||
name = "Pitcher"
|
||||
desc = "A large Pitcher to hold vast amounts of liquid."
|
||||
id = "emptypitcher"
|
||||
build_type = PROTOLATHE
|
||||
materials = list(/datum/material/glass = 3600)
|
||||
build_path = /obj/item/reagent_containers/food/drinks/bottle/blank/pitcher
|
||||
category = list("Equipment")
|
||||
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
|
||||
|
||||
/datum/design/air_horn
|
||||
name = "Air Horn"
|
||||
desc = "Damn son, where'd you find this?"
|
||||
|
||||
@@ -14,8 +14,8 @@
|
||||
|
||||
/datum/techweb_node/bottle_exports
|
||||
id = "bottle_exports"
|
||||
display_name = "Legal Bottling"
|
||||
display_name = "Advanced Bottling"
|
||||
prereq_ids = list("blueprinted_bottles")
|
||||
description = "New bottles for printing and selling."
|
||||
design_ids = list("minikeg", "blooddrop", "slim_gold", "white_bloodmoon", "greenroad")
|
||||
description = "New bottles for printing, storage and selling."
|
||||
design_ids = list("minikeg", "blooddrop", "slim_gold", "white_bloodmoon", "greenroad", "emptyglassbottle", "largeemptyglassbottle", "emptypitcher")
|
||||
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 250)
|
||||
|
||||
@@ -5,6 +5,9 @@
|
||||
icon_deny = "boozeomat-deny"
|
||||
products = list(/obj/item/reagent_containers/food/drinks/drinkingglass = 30,
|
||||
/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass = 12,
|
||||
/obj/item/reagent_containers/food/drinks/bottle/blank = 5,
|
||||
/obj/item/reagent_containers/food/drinks/bottle/blank/small = 10,
|
||||
/obj/item/reagent_containers/food/drinks/bottle/blank/pitcher = 2,
|
||||
/obj/item/reagent_containers/food/drinks/bottle/gin = 5,
|
||||
/obj/item/reagent_containers/food/drinks/bottle/whiskey = 5,
|
||||
/obj/item/reagent_containers/food/drinks/bottle/tequila = 5,
|
||||
|
||||
@@ -50,6 +50,44 @@
|
||||
-->
|
||||
<div class="commit sansserif">
|
||||
|
||||
<h2 class="date">22 August 2021</h2>
|
||||
<h3 class="author">zeroisthebiggay updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="spellcheck">trillby can't spell pair</li>
|
||||
</ul>
|
||||
|
||||
<h2 class="date">20 August 2021</h2>
|
||||
<h3 class="author">EmeraldSundisk updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="rscadd">Adds a law office/courtroom to OmegaStation</li>
|
||||
<li class="rscadd">Adds a gateway to OmegaStation</li>
|
||||
<li class="rscadd">Adds a pool/maintenance bar to OmegaStation</li>
|
||||
<li class="rscdel">Removes the original maintenance garden in OmegaStation tweak: Relocates the bathrooms to the starboard hall tweak: Modifies port quarter maintenance to include some affected items</li>
|
||||
</ul>
|
||||
<h3 class="author">Putnam3145 updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="rscadd">Beach now has showers</li>
|
||||
</ul>
|
||||
<h3 class="author">TripleShades updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="rscadd">At least four or five space heaters spread across Pubby Station Maints</li>
|
||||
<li class="rscadd">Missing decal in Pubby Station engineering</li>
|
||||
<li class="bugfix">Moved an atmos alarm in the SM emitter chamber so it wont be destroyed</li>
|
||||
</ul>
|
||||
<h3 class="author">WanderingFox95 updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="rscadd">Empty bottles and pitchers are available to the bartender now.</li>
|
||||
<li class="imageadd">They even come with 10 different fillstates!</li>
|
||||
<li class="imageadd">Better Shark Tails, dodododododo~</li>
|
||||
<li class="rscadd">The old ones are now listed as carp tails.</li>
|
||||
</ul>
|
||||
|
||||
<h2 class="date">18 August 2021</h2>
|
||||
<h3 class="author">timothyteakettle updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="rscadd">lets you select 4 prosthetic limbs instead of only 2</li>
|
||||
</ul>
|
||||
|
||||
<h2 class="date">16 August 2021</h2>
|
||||
<h3 class="author">BlueWildrose updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
@@ -444,78 +482,6 @@
|
||||
<ul class="changes bgimages16">
|
||||
<li class="bugfix">vore is 0.1% less shitcode</li>
|
||||
</ul>
|
||||
|
||||
<h2 class="date">20 June 2021</h2>
|
||||
<h3 class="author">Arturlang updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="rscadd">Port's TG's nanite storage modification programs from the bepis</li>
|
||||
<li class="bugfix">Fixes infective nanite progreams not syncing cloud ID.</li>
|
||||
<li class="rscadd">Add's off icons for nanite machinery</li>
|
||||
<li class="bugfix">Fixes antitox nanites runtiming on simplemobs</li>
|
||||
<li class="rscadd">Updates the nanite dermal button icon set</li>
|
||||
<li class="rscadd">Adds the ability to select the logic for nanite rules</li>
|
||||
<li class="bugfix">Nanite programs with triggers won't ignore rules.</li>
|
||||
<li class="bugfix">Coagluating nanite program research no longer has the wrong name tweak: Nanite program's have better descriptions now tweak: Nanite subdermal ID's now also include pulled ID's for simplemobs</li>
|
||||
<li class="bugfix">Nanite voice sensors should properly work now.</li>
|
||||
<li class="bugfix">Fixes nanite comm remote, now they should actually work</li>
|
||||
</ul>
|
||||
<h3 class="author">EmeraldSundisk updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="rscadd">Adds ColorMates to Snow Taxi tweak: Slight adjustments near the arrival shuttle landing zone</li>
|
||||
<li class="rscdel">Removes an undesired corporate entity</li>
|
||||
</ul>
|
||||
<h3 class="author">Nanotrasen Structual Engineering Division updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="rscadd">Added lables to the atmos tanks on Metastation.</li>
|
||||
<li class="rscadd">Adjusted Pubbystation's emitter room wall layout to prevent light-breakage on startup of emitters.</li>
|
||||
<li class="rscdel">Removed frestanding sink and showers from Metastation science airlock, and Deltastation Xenobio. Added an emergency shower next to the kill room.</li>
|
||||
<li class="bugfix">Removed a leftover pipe in Metastation security hallway.</li>
|
||||
</ul>
|
||||
<h3 class="author">bunny232 updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="bugfix">Pressure tanks other then air tanks start with gas!</li>
|
||||
</ul>
|
||||
<h3 class="author">keronshb updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="rscadd">Adds the Space Dragon midround event</li>
|
||||
<li class="soundadd">Space Dragon sounds</li>
|
||||
<li class="imageadd">Space Dragon + effects</li>
|
||||
<li class="code_imp">Added Spacewalk trait</li>
|
||||
<li class="code_imp">Gibs the original owner if they are turned into a Space Dragon with the traitor panel</li>
|
||||
<li class="admin">logging for Space Dragon creation</li>
|
||||
</ul>
|
||||
<h3 class="author">kiwedespars updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="rscadd">a downside to wheely heelies ((made it actually detrimental))</li>
|
||||
</ul>
|
||||
<h3 class="author">zeroisthebiggay updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="imageadd">beltslot sprites for various items</li>
|
||||
<li class="imageadd">resprite for telebaton</li>
|
||||
</ul>
|
||||
|
||||
<h2 class="date">19 June 2021</h2>
|
||||
<h3 class="author">keronshb updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="bugfix">Ling Bone Gauntlets work again</li>
|
||||
</ul>
|
||||
|
||||
<h2 class="date">17 June 2021</h2>
|
||||
<h3 class="author">Vynzill updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="rscadd">ability to change crafted armwrap sprite to alternate one.</li>
|
||||
<li class="imageadd">extended armwrap icon and sprite</li>
|
||||
</ul>
|
||||
<h3 class="author">timothyteakettle updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="bugfix">fixes an oversight causing embed jostling to do 2x as much damage as it should</li>
|
||||
</ul>
|
||||
|
||||
<h2 class="date">16 June 2021</h2>
|
||||
<h3 class="author">silicons updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="bugfix">on_found works again</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<b>GoonStation 13 Development Team</b>
|
||||
|
||||
@@ -29816,3 +29816,28 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
|
||||
BZ stasis on the station.
|
||||
bunny232:
|
||||
- bugfix: Polyvitiligo actually changes your color now
|
||||
2021-08-18:
|
||||
timothyteakettle:
|
||||
- rscadd: lets you select 4 prosthetic limbs instead of only 2
|
||||
2021-08-20:
|
||||
EmeraldSundisk:
|
||||
- rscadd: Adds a law office/courtroom to OmegaStation
|
||||
- rscadd: Adds a gateway to OmegaStation
|
||||
- rscadd: Adds a pool/maintenance bar to OmegaStation
|
||||
- rscdel: 'Removes the original maintenance garden in OmegaStation tweak: Relocates
|
||||
the bathrooms to the starboard hall tweak: Modifies port quarter maintenance
|
||||
to include some affected items'
|
||||
Putnam3145:
|
||||
- rscadd: Beach now has showers
|
||||
TripleShades:
|
||||
- rscadd: At least four or five space heaters spread across Pubby Station Maints
|
||||
- rscadd: Missing decal in Pubby Station engineering
|
||||
- bugfix: Moved an atmos alarm in the SM emitter chamber so it wont be destroyed
|
||||
WanderingFox95:
|
||||
- rscadd: Empty bottles and pitchers are available to the bartender now.
|
||||
- imageadd: They even come with 10 different fillstates!
|
||||
- imageadd: Better Shark Tails, dodododododo~
|
||||
- rscadd: The old ones are now listed as carp tails.
|
||||
2021-08-22:
|
||||
zeroisthebiggay:
|
||||
- spellcheck: trillby can't spell pair
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 117 KiB After Width: | Height: | Size: 118 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 12 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.9 KiB After Width: | Height: | Size: 5.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 69 KiB After Width: | Height: | Size: 75 KiB |
Reference in New Issue
Block a user