mirror of
https://github.com/CHOMPstation/CHOMPstation.git
synced 2026-08-29 15:06:39 +01:00
Merge branch 'master' of https://github.com/CHOMPstation/CHOMPstation into ErikTheDogEdits
# Conflicts: # code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
This commit is contained in:
@@ -979,12 +979,19 @@
|
||||
helmet.name = "engineering voidsuit helmet"
|
||||
helmet.icon_state = "rig0-engineering"
|
||||
helmet.item_state = "rig0-engineering"
|
||||
helmet.max_heat_protection_temperature = HELMET_MAX_HEAT_PROTECTION_TEMPERATURE
|
||||
helmet.armor = list(melee = 40, bullet = 5, laser = 20, energy = 5, bomb = 35, bio = 100, rad = 80)
|
||||
helmet.desc = "A special helmet designed for work in a hazardous, low-pressure environment. Has radiation shielding."
|
||||
if(suit)
|
||||
suit.name = "engineering voidsuit"
|
||||
suit.icon_state = "rig-engineering"
|
||||
suit.item_state = "rig-engineering"
|
||||
suit.item_state_slots[slot_r_hand_str] = "eng_voidsuit"
|
||||
suit.item_state_slots[slot_l_hand_str] = "eng_voidsuit"
|
||||
suit.max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE
|
||||
suit.armor = list(melee = 40, bullet = 5, laser = 20, energy = 5, bomb = 35, bio = 100, rad = 80)
|
||||
suit.desc = "A special suit that protects against hazardous, low pressure environments. Has radiation shielding."
|
||||
|
||||
if("Mining")
|
||||
if(helmet)
|
||||
helmet.name = "mining voidsuit helmet"
|
||||
@@ -1001,12 +1008,16 @@
|
||||
helmet.name = "medical voidsuit helmet"
|
||||
helmet.icon_state = "rig0-medical"
|
||||
helmet.item_state = "rig0-medical"
|
||||
helmet.armor = list(melee = 30, bullet = 5, laser = 20, energy = 5, bomb = 25, bio = 100, rad = 50)
|
||||
helmet.desc = "A special helmet that protects against hazardous, low pressure environments. Has minor radiation shielding."
|
||||
if(suit)
|
||||
suit.name = "medical voidsuit"
|
||||
suit.icon_state = "rig-medical"
|
||||
suit.item_state = "rig-medical"
|
||||
suit.item_state_slots[slot_r_hand_str] = "medical_voidsuit"
|
||||
suit.item_state_slots[slot_l_hand_str] = "medical_voidsuit"
|
||||
suit.armor = list(melee = 30, bullet = 5, laser = 20, energy = 5, bomb = 25, bio = 100, rad = 50)
|
||||
suit.desc = "A special suit that protects against hazardous, low pressure environments. Has minor radiation shielding."
|
||||
if("Security")
|
||||
if(helmet)
|
||||
helmet.name = "security voidsuit helmet"
|
||||
@@ -1034,56 +1045,89 @@
|
||||
helmet.name = "atmospherics voidsuit helmet"
|
||||
helmet.icon_state = "rig0-atmos"
|
||||
helmet.item_state = "rig0-atmos"
|
||||
helmet.max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE
|
||||
helmet.armor = list(melee = 40, bullet = 5, laser = 20, energy = 5, bomb = 35, bio = 100, rad = 50)
|
||||
helmet.desc = "A special helmet designed for work in a hazardous, low pressure environments. Has improved thermal protection and minor radiation shielding."
|
||||
|
||||
if(suit)
|
||||
suit.name = "atmospherics voidsuit"
|
||||
suit.icon_state = "rig-atmos"
|
||||
suit.item_state = "rig-atmos"
|
||||
suit.item_state_slots[slot_r_hand_str] = "atmos_voidsuit"
|
||||
suit.item_state_slots[slot_l_hand_str] = "atmos_voidsuit"
|
||||
suit.max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE
|
||||
suit.armor = list(melee = 40, bullet = 5, laser = 20, energy = 5, bomb = 35, bio = 100, rad = 50)
|
||||
suit.desc = "A special suit that protects against hazardous, low pressure environments. Has improved thermal protection and minor radiation shielding."
|
||||
|
||||
if("HAZMAT")
|
||||
if(helmet)
|
||||
helmet.name = "HAZMAT voidsuit helmet"
|
||||
helmet.icon_state = "rig0-engineering_rad"
|
||||
helmet.item_state = "rig0-engineering_rad"
|
||||
helmet.max_heat_protection_temperature = HELMET_MAX_HEAT_PROTECTION_TEMPERATURE
|
||||
helmet.armor = list(melee = 30, bullet = 5, laser = 20, energy = 5, bomb = 50, bio = 100, rad = 100)
|
||||
helmet.desc = "A engineering helmet designed for work in a low-pressure environment. Extra radiation shielding appears to have been installed at the price of comfort."
|
||||
|
||||
if(suit)
|
||||
suit.name = "HAZMAT voidsuit"
|
||||
suit.icon_state = "rig-engineering_rad"
|
||||
suit.item_state = "rig-engineering_rad"
|
||||
suit.item_state_slots[slot_r_hand_str] = "eng_voidsuit_rad"
|
||||
suit.item_state_slots[slot_l_hand_str] = "eng_voidsuit_rad"
|
||||
suit.max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE
|
||||
suit.armor = list(melee = 30, bullet = 5, laser = 20, energy = 5, bomb = 50, bio = 100, rad = 100)
|
||||
suit.desc = "A engineering voidsuit that protects against hazardous, low pressure environments. Has enhanced radiation shielding compared to regular engineering voidsuits."
|
||||
if("Construction")
|
||||
if(helmet)
|
||||
helmet.name = "Construction voidsuit helmet"
|
||||
helmet.icon_state = "rig0-engineering_con"
|
||||
helmet.item_state = "rig0-engineering_con"
|
||||
helmet.max_heat_protection_temperature = HELMET_MAX_HEAT_PROTECTION_TEMPERATURE
|
||||
helmet.armor = list(melee = 40, bullet = 5, laser = 20, energy = 5, bomb = 35, bio = 100, rad = 80)
|
||||
helmet.desc = "A special helmet designed for work in a hazardous, low-pressure environment. Has radiation shielding."
|
||||
if(suit)
|
||||
suit.name = "Construction voidsuit"
|
||||
suit.icon_state = "rig-engineering_con"
|
||||
suit.item_state = "rig-engineering_con"
|
||||
suit.item_state_slots[slot_r_hand_str] = "eng_voidsuit_con"
|
||||
suit.item_state_slots[slot_l_hand_str] = "eng_voidsuit_con"
|
||||
suit.max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE
|
||||
suit.armor = list(melee = 40, bullet = 5, laser = 20, energy = 5, bomb = 35, bio = 100, rad = 80)
|
||||
suit.desc = "A special suit designed for work in a hazardous, low-pressure environment. Has radiation shielding."
|
||||
|
||||
if("Biohazard")
|
||||
if(helmet)
|
||||
helmet.name = "Biohazard voidsuit helmet"
|
||||
helmet.icon_state = "rig0-medical_bio"
|
||||
helmet.item_state = "rig0-medical_bio"
|
||||
helmet.armor = list(melee = 45, bullet = 5, laser = 20, energy = 5, bomb = 15, bio = 100, rad = 75)
|
||||
helmet.desc = "A special helmet that protects against hazardous environments. Has minor radiation shielding."
|
||||
|
||||
if(suit)
|
||||
suit.name = "Biohazard voidsuit"
|
||||
suit.icon_state = "rig-medical_bio"
|
||||
suit.item_state = "rig-medical_bio"
|
||||
suit.item_state_slots[slot_r_hand_str] = "medical_voidsuit_bio"
|
||||
suit.item_state_slots[slot_l_hand_str] = "medical_voidsuit_bio"
|
||||
suit.armor = list(melee = 45, bullet = 5, laser = 20, energy = 5, bomb = 15, bio = 100, rad = 75)
|
||||
suit.desc = "A special suit that protects against hazardous, environments. It feels heavier than the standard suit with extra protection around the joints."
|
||||
|
||||
if("Emergency Medical Response")
|
||||
if(helmet)
|
||||
helmet.name = "emergency medical response voidsuit helmet"
|
||||
helmet.icon_state = "rig0-medical_emt"
|
||||
helmet.item_state = "rig0-medical_emt"
|
||||
helmet.armor = list(melee = 30, bullet = 5, laser = 20, energy = 5, bomb = 25, bio = 100, rad = 50)
|
||||
helmet.desc = "A special helmet that protects against hazardous, low pressure environments. Has minor radiation shielding."
|
||||
|
||||
if(suit)
|
||||
suit.name = "emergency medical response voidsuit"
|
||||
suit.icon_state = "rig-medical_emt"
|
||||
suit.item_state = "rig-medical_emt"
|
||||
suit.item_state_slots[slot_r_hand_str] = "medical_voidsuit_emt"
|
||||
suit.item_state_slots[slot_l_hand_str] = "medical_voidsuit_emt"
|
||||
suit.armor = list(melee = 30, bullet = 5, laser = 20, energy = 5, bomb = 25, bio = 100, rad = 50)
|
||||
suit.desc = "A special suit that protects against hazardous, low pressure environments. Has minor radiation shielding."
|
||||
if("^%###^%$" || "Mercenary")
|
||||
if(helmet)
|
||||
helmet.name = "blood-red voidsuit helmet"
|
||||
|
||||
@@ -689,6 +689,7 @@
|
||||
/obj/item/weapon/reagent_containers/food/drinks/glass2/mug = 10,
|
||||
/obj/item/weapon/reagent_containers/food/drinks/glass2/wine = 10,
|
||||
/obj/item/weapon/reagent_containers/food/drinks/metaglass = 10,
|
||||
/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint = 10,
|
||||
/obj/item/weapon/reagent_containers/food/drinks/bottle/gin = 5,
|
||||
/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe = 5,
|
||||
/obj/item/weapon/reagent_containers/food/drinks/bottle/bluecuracao = 5,
|
||||
|
||||
@@ -20,13 +20,14 @@
|
||||
/mob/living/simple_animal/hostile/goose = 60,
|
||||
/mob/living/simple_animal/retaliate/bee = 50,
|
||||
/mob/living/simple_animal/hostile/metroid/mine = 20,
|
||||
)
|
||||
)
|
||||
|
||||
/obj/structure/mob_spawner/scanner/mining_animals/do_spawn(var/mob_path)
|
||||
if(!ispath(mob_path))
|
||||
return 0
|
||||
var/mob/living/L = new mob_path(get_turf(src))
|
||||
L/simple_animal.vore_escape_time = 15 SECONDS
|
||||
if (ispath(L, /mob/living/simple_animal))
|
||||
L/simple_animal.vore_escape_time = 15 SECONDS // Mob vore nerf!
|
||||
L.source_spawner = src
|
||||
spawned_mobs.Add(L)
|
||||
last_spawn = world.time
|
||||
|
||||
@@ -227,9 +227,14 @@
|
||||
|
||||
/obj/item/clothing/suit/storage/seromi/cloak/jobs/sec
|
||||
name = "Security cloak"
|
||||
desc = "A soft teshari cloak made for the Security department"
|
||||
desc = "A soft teshari cloak made for the Security department. This one is made with stronger fibers."
|
||||
icon_state = "tesh_cloak_sec"
|
||||
item_state = "tesh_cloak_sec"
|
||||
allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/device/flashlight/maglight,/obj/item/clothing/head/helmet)
|
||||
body_parts_covered = UPPER_TORSO|LOWER_TORSO
|
||||
item_flags = THICKMATERIAL
|
||||
siemens_coefficient = 0.6
|
||||
armor = list(melee = 40, bullet = 30, laser = 30, energy = 10, bomb = 10, bio = 0, rad = 0)
|
||||
|
||||
/obj/item/clothing/suit/storage/seromi/cloak/jobs/qm
|
||||
name = "Quartermaster's cloak"
|
||||
|
||||
@@ -262,9 +262,12 @@
|
||||
|
||||
/obj/item/clothing/under/seromi/undercoat/jobs/sec
|
||||
name = "Security undercoat"
|
||||
desc = "A traditional teshari garb made for the Security department"
|
||||
desc = "A traditional teshari garb made for the Security department. Made with slightly sturdier materials"
|
||||
icon_state = "tesh_uniform_sec"
|
||||
item_state = "tesh_uniform_sec"
|
||||
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
|
||||
siemens_coefficient = 0.9
|
||||
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
|
||||
|
||||
/obj/item/clothing/under/seromi/undercoat/jobs/qm
|
||||
name = "Quartermaster's undercoat"
|
||||
|
||||
@@ -284,7 +284,8 @@
|
||||
apply_damage(real_damage, hit_dam_type, hit_zone, armour, soaked, sharp=attack.sharp, edge=attack.edge)
|
||||
|
||||
if(I_DISARM)
|
||||
add_attack_logs(H,src,"Disarmed")
|
||||
// Having this log every time someone disarms even when the disarm does nothing is REALLY ANNOYING. -Erik
|
||||
// add_attack_logs(H,src,"Disarmed")
|
||||
|
||||
M.do_attack_animation(src)
|
||||
|
||||
@@ -309,6 +310,8 @@
|
||||
visible_message("<span class='warning'>[M] has weakly pushed [src]!</span>")
|
||||
return
|
||||
|
||||
add_attack_logs(H,src,"Disarmed")
|
||||
|
||||
var/randn = rand(1, 100)
|
||||
last_push_time = world.time
|
||||
if(!(species.flags & NO_SLIP) && randn <= 25)
|
||||
|
||||
@@ -646,6 +646,8 @@
|
||||
if(prob(60))
|
||||
M.take_organ_damage(4 * removed, 0)
|
||||
|
||||
//TFF 25/5/19 - attempt to reduce message spam for Prommies and Spaceacillin
|
||||
#define ANTIBIO_MESSAGE_DELAY 5*60*10
|
||||
/datum/reagent/spaceacillin
|
||||
name = "Spaceacillin"
|
||||
id = "spaceacillin"
|
||||
@@ -657,11 +659,19 @@
|
||||
mrate_static = TRUE
|
||||
overdose = REAGENTS_OVERDOSE
|
||||
scannable = 1
|
||||
<<<<<<< HEAD
|
||||
//data = 0
|
||||
=======
|
||||
data = 0
|
||||
var/delay = 0
|
||||
>>>>>>> 2d1e52c83fa9d4bd4029e9061613bcb7722251ee
|
||||
|
||||
/datum/reagent/spaceacillin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
|
||||
..()
|
||||
if(!delay)
|
||||
delay = world.time
|
||||
if(alien == IS_SLIME)
|
||||
<<<<<<< HEAD
|
||||
// if(volume <= 0.1 && data != -1)
|
||||
// data = -1
|
||||
// else
|
||||
@@ -675,6 +685,17 @@
|
||||
to_chat(M, "<spam class='notice'>You regain focus...</span>")
|
||||
if(dose <= metabolism)
|
||||
to_chat(M, "<span class = 'warning'>Your senses feel unfocused, and divided.</span>")
|
||||
=======
|
||||
ingest_met = 0.25
|
||||
if(volume <= 0.1 && data != -1 && world.time > delay + ANTIBIO_MESSAGE_DELAY)
|
||||
delay = world.time
|
||||
to_chat(M, "<span class='notice'>You regain focus...</span>")
|
||||
else
|
||||
delay = (5 MINUTES)
|
||||
if(world.time > delay + ANTIBIO_MESSAGE_DELAY)
|
||||
delay = world.time
|
||||
to_chat(M, "<span class='warning'>Your senses feel unfocused, and divided.</span>")
|
||||
>>>>>>> 2d1e52c83fa9d4bd4029e9061613bcb7722251ee
|
||||
M.add_chemical_effect(CE_ANTIBIOTIC, dose >= overdose ? ANTIBIO_OD : ANTIBIO_NORM)
|
||||
|
||||
/datum/reagent/corophizine
|
||||
@@ -847,6 +868,7 @@
|
||||
|
||||
#define ANTIDEPRESSANT_MESSAGE_DELAY 5*60*10
|
||||
|
||||
//TFF 25/5/19 - Revert an edit, restore message display with the med being processed faster
|
||||
/datum/reagent/methylphenidate
|
||||
name = "Methylphenidate"
|
||||
id = "methylphenidate"
|
||||
@@ -855,7 +877,9 @@
|
||||
reagent_state = LIQUID
|
||||
color = "#BF80BF"
|
||||
metabolism = 0.01
|
||||
ingest_met = 0.25
|
||||
mrate_static = TRUE
|
||||
<<<<<<< HEAD
|
||||
// data = 0
|
||||
// var/delay = 0
|
||||
|
||||
@@ -877,7 +901,22 @@
|
||||
M << "<span class='warning'>You lose focus...</span>"
|
||||
if(dose <= metabolism)
|
||||
M << "<span class='notice'>Your mind feels focused and undivided.</span>"
|
||||
=======
|
||||
data = 0
|
||||
|
||||
/datum/reagent/methylphenidate/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
|
||||
if(alien == IS_DIONA)
|
||||
return
|
||||
if(volume <= 0.1 && data != -1)
|
||||
data = -1
|
||||
M << "<span class='warning'>You lose focus...</span>"
|
||||
else
|
||||
if(world.time > data + ANTIDEPRESSANT_MESSAGE_DELAY)
|
||||
data = world.time
|
||||
M << "<span class='notice'>Your mind feels focused and undivided.</span>"
|
||||
>>>>>>> 2d1e52c83fa9d4bd4029e9061613bcb7722251ee
|
||||
|
||||
//TFF 25/5/19 - Revert an edit, restore message display with the med being processed faster
|
||||
/datum/reagent/citalopram
|
||||
name = "Citalopram"
|
||||
id = "citalopram"
|
||||
@@ -886,7 +925,9 @@
|
||||
reagent_state = LIQUID
|
||||
color = "#FF80FF"
|
||||
metabolism = 0.01
|
||||
ingest_met = 0.25
|
||||
mrate_static = TRUE
|
||||
<<<<<<< HEAD
|
||||
// data = 0
|
||||
// var/delay = 0
|
||||
|
||||
@@ -908,7 +949,22 @@
|
||||
to_chat(M, "<span class='warning'>Your mind feels a little less stable...</span>")
|
||||
if(dose <= metabolism)
|
||||
to_chat(M, "<span class='notice'>Your mind feels stable... a little stable.</span>")
|
||||
=======
|
||||
data = 0
|
||||
|
||||
/datum/reagent/citalopram/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
|
||||
if(alien == IS_DIONA)
|
||||
return
|
||||
if(volume <= 0.1 && data != -1)
|
||||
data = -1
|
||||
to_chat(M, "<span class='warning'>Your mind feels a little less stable...</span>")
|
||||
else
|
||||
if(world.time > data + ANTIDEPRESSANT_MESSAGE_DELAY)
|
||||
data = world.time
|
||||
to_chat(M, "<span class='notice'>Your mind feels stable... a little stable.</span>")
|
||||
>>>>>>> 2d1e52c83fa9d4bd4029e9061613bcb7722251ee
|
||||
|
||||
//TFF 25/5/19 - Revert an edit, restore message display with the med being processed faster
|
||||
/datum/reagent/paroxetine
|
||||
name = "Paroxetine"
|
||||
id = "paroxetine"
|
||||
@@ -917,13 +973,19 @@
|
||||
reagent_state = LIQUID
|
||||
color = "#FF80BF"
|
||||
metabolism = 0.01
|
||||
ingest_met = 0.25
|
||||
mrate_static = TRUE
|
||||
<<<<<<< HEAD
|
||||
//data = 0
|
||||
//var/delay = 0
|
||||
=======
|
||||
data = 0
|
||||
>>>>>>> 2d1e52c83fa9d4bd4029e9061613bcb7722251ee
|
||||
|
||||
/datum/reagent/paroxetine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
|
||||
if(alien == IS_DIONA)
|
||||
return
|
||||
<<<<<<< HEAD
|
||||
// if(volume <= 0.1 && world.time > delay + ANTIDEPRESSANT_MESSAGE_DELAY)
|
||||
// delay = world.time
|
||||
// M << "<span class='warning'>Your mind feels much less stable...</span>"
|
||||
@@ -945,6 +1007,19 @@
|
||||
else
|
||||
M << "<span class='warning'>Your mind breaks apart...</span>"
|
||||
M.hallucination += 200
|
||||
=======
|
||||
if(volume <= 0.1 && data != -1)
|
||||
data = -1
|
||||
M << "<span class='warning'>Your mind feels much less stable...</span>"
|
||||
else
|
||||
if(world.time > data + ANTIDEPRESSANT_MESSAGE_DELAY)
|
||||
data = world.time
|
||||
if(prob(90))
|
||||
M << "<span class='notice'>Your mind feels much more stable.</span>"
|
||||
else
|
||||
M << "<span class='warning'>Your mind breaks apart...</span>"
|
||||
M.hallucination += 200
|
||||
>>>>>>> 2d1e52c83fa9d4bd4029e9061613bcb7722251ee
|
||||
|
||||
/datum/reagent/qerr_quem
|
||||
name = "Qerr-quem"
|
||||
@@ -954,6 +1029,7 @@
|
||||
reagent_state = LIQUID
|
||||
color = "#e6efe3"
|
||||
metabolism = 0.01
|
||||
ingest_met = 0.25
|
||||
mrate_static = TRUE
|
||||
// data = 0
|
||||
|
||||
|
||||
@@ -9,6 +9,12 @@
|
||||
matter = list("glass" = 500)
|
||||
icon = 'icons/obj/drinks.dmi'
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint
|
||||
name = "metamorphic pint glass"
|
||||
desc = "This glass changes shape and form depending on the drink inside... fancy!"
|
||||
icon_state = "pglass_empty"
|
||||
volume = 60
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/drinks/metaglass/on_reagent_change()
|
||||
if (reagents.reagent_list.len > 0)
|
||||
var/datum/reagent/R = reagents.get_master_reagent()
|
||||
@@ -38,12 +44,17 @@
|
||||
else
|
||||
price_tag = null
|
||||
else
|
||||
icon_state = "glass_empty"
|
||||
name = "metamorphic glass"
|
||||
desc = "This glass changes shape and form depending on the drink inside... fancy!"
|
||||
center_of_mass = list("x"=16, "y"=10)
|
||||
return
|
||||
|
||||
if(type == /obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint)
|
||||
icon_state = "pglass_empty"
|
||||
name = "metamorphic pint glass"
|
||||
desc = "This glass changes shape and form depending on the drink inside... fancy!"
|
||||
center_of_mass = list("x"=16, "y"=10)
|
||||
else
|
||||
icon_state = "glass_empty"
|
||||
name = "metamorphic glass"
|
||||
desc = "This glass changes shape and form depending on the drink inside... fancy!"
|
||||
center_of_mass = list("x"=16, "y"=10)
|
||||
return
|
||||
|
||||
/*
|
||||
Drinks Data
|
||||
@@ -374,7 +385,7 @@ Drinks Data
|
||||
glass_icon_state = "gintonicglass"
|
||||
|
||||
/datum/reagent/ethanol/goldschlager
|
||||
glass_icon_state = "ginvodkaglass"
|
||||
glass_icon_state = "goldschlagerglass"
|
||||
glass_center_of_mass = list("x"=16, "y"=12)
|
||||
|
||||
/datum/reagent/ethanol/hippies_delight
|
||||
@@ -569,3 +580,6 @@ Drinks Data
|
||||
|
||||
/datum/reagent/ethanol/hachi
|
||||
glass_icon_state = "hachi"
|
||||
|
||||
/datum/reagent/ethanol/mojito
|
||||
glass_icon_state = "mojito"
|
||||
@@ -53,6 +53,34 @@
|
||||
|
||||
-->
|
||||
<div class="commit sansserif">
|
||||
<h2 class="date">27 May 2019</h2>
|
||||
<h3 class="author">Darlantanis updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="bugfix">Fixes goldschlager to use the correct metamorphic glass sprite (it used vodka/gin before).</li>
|
||||
<li class="rscadd">Adds a metamorphic pint glass.</li>
|
||||
<li class="rscadd">Adds said glass to the booze-o-mat.</li>
|
||||
</ul>
|
||||
<h3 class="author">ExabyteDiscord updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="bugfix">Proper fix for Spaceacillin spam messages for Prometheans.</li>
|
||||
<li class="bugfix">Simplify spaghetti code with antidepressants while fixing regularly displayed messages.</li>
|
||||
</ul>
|
||||
|
||||
<h2 class="date">26 May 2019</h2>
|
||||
<h3 class="author">Darlantanis updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="bugfix">Adds a line to the metamorphic glass to use the mojito icon which has existed but never been used.</li>
|
||||
</ul>
|
||||
<h3 class="author">Razgriz1032 updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="bugfix">Colourable lizard tail (Roiz) sprite greyscaled for proper colouring.</li>
|
||||
<li class="tweak">Teshari Security Cloak and Undercloak have 1:1 stats with security armor vests and security jumpsuits respectively. No longer is there a stats choice for the sake of aesthetics.</li>
|
||||
</ul>
|
||||
<h3 class="author">TheFurryFeline updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="bugfix">Fixes message spam for Prommies and Spaceacillin. Also reverts a past edit to restore message outputs for psychiatric medications.</li>
|
||||
</ul>
|
||||
|
||||
<h2 class="date">25 May 2019</h2>
|
||||
<h3 class="author">Darlantanis updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
|
||||
@@ -4193,3 +4193,25 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
|
||||
- rscadd: 'Implements full version of timeclocks: you''ll be able to switch off
|
||||
or on duty without needing an HOP on the shift, unless the job is in Command
|
||||
or IAA. For those, you will need the HOP or a CD to change your job.'
|
||||
2019-05-26:
|
||||
Darlantanis:
|
||||
- bugfix: Adds a line to the metamorphic glass to use the mojito icon which has
|
||||
existed but never been used.
|
||||
Razgriz1032:
|
||||
- bugfix: Colourable lizard tail (Roiz) sprite greyscaled for proper colouring.
|
||||
- tweak: Teshari Security Cloak and Undercloak have 1:1 stats with security armor
|
||||
vests and security jumpsuits respectively. No longer is there a stats choice
|
||||
for the sake of aesthetics.
|
||||
TheFurryFeline:
|
||||
- bugfix: Fixes message spam for Prommies and Spaceacillin. Also reverts a past
|
||||
edit to restore message outputs for psychiatric medications.
|
||||
2019-05-27:
|
||||
Darlantanis:
|
||||
- bugfix: Fixes goldschlager to use the correct metamorphic glass sprite (it used
|
||||
vodka/gin before).
|
||||
- rscadd: Adds a metamorphic pint glass.
|
||||
- rscadd: Adds said glass to the booze-o-mat.
|
||||
ExabyteDiscord:
|
||||
- bugfix: Proper fix for Spaceacillin spam messages for Prometheans.
|
||||
- bugfix: Simplify spaghetti code with antidepressants while fixing regularly displayed
|
||||
messages.
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
author: Razgriz1032
|
||||
|
||||
|
||||
delete-after: True
|
||||
|
||||
changes:
|
||||
- rscadd: "Suit Cycler now applies the proper armor, descriptions, and temperature protection stats to all of the engineering and medical suits."
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 88 KiB After Width: | Height: | Size: 89 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 94 KiB After Width: | Height: | Size: 94 KiB |
Reference in New Issue
Block a user