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

Hard upstream sync (#6951)

Browse Source 
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
This commit is contained in:
deathride58
2018-05-31 23:03:18 +00:00
committed by kevinz000
parent b6e608cb4c
commit 2f9e3e403d
395 changed files with 134016 additions and 26287 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+3 -1
View File
@@ -315,6 +315,9 @@ obj/machinery/chem_dispenser/proc/work_animation()
return cell
/obj/machinery/chem_dispenser/emp_act(severity)
. = ..()
if(. & EMP_PROTECT_SELF)
return
var/list/datum/reagents/R = list()
var/total = min(rand(7,15), FLOOR(cell.charge*powerefficiency, 1))
var/datum/reagents/Q = new(total*10)
@@ -330,7 +333,6 @@ obj/machinery/chem_dispenser/proc/work_animation()
cell.emp_act(severity)
work_animation()
visible_message("<span class='danger'>[src] malfunctions, spraying chemicals everywhere!</span>")
..()
/obj/machinery/chem_dispenser/RefreshParts()
code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+40 -5
View File
@@ -1562,35 +1562,70 @@ All effects don't start immediately, but rather get worse over time; the rate is
/datum/reagent/consumable/ethanol/alexander
name = "Alexander"
id = "alexander"
description = "A creamy, indulgent delight that is stronger than it seems."
description = "Named after a Greek hero, this mix is said to embolden a user's shield as if they were in a phalanx."
color = "#F5E9D3"
boozepwr = 80
taste_description = "bitter, creamy cacao"
glass_icon_state = "alexander"
glass_name = "Alexander"
glass_desc = "A creamy, indulgent delight that is stronger than it seems."
var/obj/item/shield/mighty_shield
/datum/reagent/consumable/ethanol/alexander/on_mob_add(mob/living/L)
if(ishuman(L))
var/mob/living/carbon/human/thehuman = L
for(var/obj/item/shield/theshield in thehuman.contents)
mighty_shield = theshield
mighty_shield.block_chance += 10
to_chat(thehuman, "<span class='notice'>[theshield] appears polished, although you don't recall polishing it.</span>")
return TRUE
/datum/reagent/consumable/ethanol/alexander/on_mob_life(mob/living/L)
..()
if(mighty_shield && !(mighty_shield in L.contents)) //If you had a shield and lose it, you lose the reagent as well. Otherwise this is just a normal drink.
L.reagents.del_reagent("alexander")
/datum/reagent/consumable/ethanol/alexander/on_mob_delete(mob/living/L)
if(mighty_shield)
mighty_shield.block_chance -= 10
to_chat(L,"<span class='notice'>You notice [mighty_shield] looks worn again. Weird.</span>")
..()
/datum/reagent/consumable/ethanol/sidecar
name = "Sidecar"
id = "sidecar"
description = "The one ride you’ll gladly give up the wheel for."
description = "The one ride you'll gladly give up the wheel for."
color = "#FFC55B"
boozepwr = 80
taste_description = "delicious freedom"
glass_icon_state = "sidecar"
glass_name = "Sidecar"
glass_desc = "The one ride you’ll gladly give up the wheel for."
glass_desc = "The one ride you'll gladly give up the wheel for."
/datum/reagent/consumable/ethanol/between_the_sheets
name = "Between the Sheets"
id = "between_the_sheets"
description = "A provocatively named classic."
description = "A provocatively named classic. Funny enough, doctors recommend drinking it before taking a nap."
color = "#F4C35A"
boozepwr = 80
taste_description = "seduction"
glass_icon_state = "between_the_sheets"
glass_name = "Between the Sheets"
glass_desc = "A provocatively named classic."
glass_desc = "The only drink that comes with a label reminding you of Nanotrasen's zero-tolerance promiscuity policy."
/datum/reagent/consumable/ethanol/between_the_sheets/on_mob_life(mob/living/L)
..()
if(L.IsSleeping())
if(L.bruteloss && L.fireloss) //If you are damaged by both types, slightly increased healing but it only heals one. The more the merrier wink wink.
if(prob(50))
L.adjustBruteLoss(-0.25)
else
L.adjustFireLoss(-0.25)
else if(L.bruteloss && !L.fireloss) //If you have only one, it still heals but not as well.
L.adjustBruteLoss(-0.2)
else if(!L.bruteloss && L.fireloss)
L.adjustFireLoss(-0.2)
/datum/reagent/consumable/ethanol/kamikaze
name = "Kamikaze"
code/modules/reagents/chemistry/reagents/drink_reagents.dm
+3 -3
View File
@@ -721,11 +721,11 @@
description = "Milk for cool kids."
color = "#7D4E29"
taste_description = "chocolate milk"
/datum/reagent/consumable/menthol
name = "Menthol"
id = "menthol"
description = "Tastes naturally minty, and imparts a very mild numbing sensation."
description = "Alleviates coughing symptoms one might have."
color = "#80AF9C"
taste_description = "mint"
glass_icon_state = "glass_green"
@@ -739,4 +739,4 @@
color = "#EA1D26"
taste_description = "sweet pomegranates"
glass_name = "glass of grenadine"
glass_desc = "Delicious flavored syrup."
glass_desc = "Delicious flavored syrup."
code/modules/reagents/chemistry/reagents/food_reagents.dm
+1 -1
View File
@@ -686,4 +686,4 @@
description = "The sorrow and melancholy of a thousand bereaved clowns, forever denied their Honkmechs."
nutriment_factor = 5 * REAGENTS_METABOLISM
color = "#eef442" // rgb: 238, 244, 66
taste_description = "mournful honking"
taste_description = "mournful honking"
code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+6 -6
View File
@@ -931,7 +931,7 @@
id = "bicaridine"
description = "Restores bruising. Overdose causes it instead."
reagent_state = LIQUID
color = "#BF0000"
color = "#C8A5DC"
overdose_threshold = 30
/datum/reagent/medicine/bicaridine/on_mob_life(mob/living/M)
@@ -949,7 +949,7 @@
id = "dexalin"
description = "Restores oxygen loss. Overdose causes it instead."
reagent_state = LIQUID
color = "#0080FF"
color = "#C8A5DC"
overdose_threshold = 30
/datum/reagent/medicine/dexalin/on_mob_life(mob/living/M)
@@ -967,7 +967,7 @@
id = "kelotane"
description = "Restores fire damage. Overdose causes it instead."
reagent_state = LIQUID
color = "#FFA800"
color = "#C8A5DC"
overdose_threshold = 30
/datum/reagent/medicine/kelotane/on_mob_life(mob/living/M)
@@ -985,7 +985,7 @@
id = "antitoxin"
description = "Heals toxin damage and removes toxins in the bloodstream. Overdose causes toxin damage."
reagent_state = LIQUID
color = "#00A000"
color = "#C8A5DC"
overdose_threshold = 30
taste_description = "a roll of gauze"
@@ -1006,7 +1006,7 @@
id = "inaprovaline"
description = "Stabilizes the breathing of patients. Good for those in critical condition."
reagent_state = LIQUID
color = "#00BFFF"
color = "#C8A5DC"
/datum/reagent/medicine/inaprovaline/on_mob_life(mob/living/M)
if(M.losebreath >= 5)
@@ -1018,7 +1018,7 @@
id = "tricordrazine"
description = "Has a high chance to heal all types of damage. Overdose instead causes it."
reagent_state = LIQUID
color = "#8040FF"
color = "#C8A5DC"
overdose_threshold = 30
taste_description = "grossness"
code/modules/reagents/chemistry/recipes/pyrotechnics.dm
+4 -3
View File
@@ -393,6 +393,7 @@
modifier = -100
mix_message = "<span class='boldannounce'>The teslium starts to spark as electricity arcs away from it!</span>"
mix_sound = 'sound/machines/defib_zap.ogg'
var/tesla_flags = TESLA_MOB_DAMAGE | TESLA_OBJ_DAMAGE | TESLA_MOB_STUN
/datum/chemical_reaction/reagent_explosion/teslium_lightning/on_reaction(datum/reagents/holder, created_volume)
var/T1 = created_volume * 20 //100 units : Zap 3 times, with powers 2000/5000/12000. Tesla revolvers have a power of 10000 for comparison.
@@ -400,15 +401,15 @@
var/T3 = created_volume * 120
sleep(5)
if(created_volume >= 75)
tesla_zap(holder.my_atom, 7, T1)
tesla_zap(holder.my_atom, 7, T1, tesla_flags)
playsound(holder.my_atom, 'sound/machines/defib_zap.ogg', 50, 1)
sleep(15)
if(created_volume >= 40)
tesla_zap(holder.my_atom, 7, T2)
tesla_zap(holder.my_atom, 7, T2, tesla_flags)
playsound(holder.my_atom, 'sound/machines/defib_zap.ogg', 50, 1)
sleep(15)
if(created_volume >= 10) //10 units minimum for lightning, 40 units for secondary blast, 75 units for tertiary blast.
tesla_zap(holder.my_atom, 7, T3)
tesla_zap(holder.my_atom, 7, T3, tesla_flags)
playsound(holder.my_atom, 'sound/machines/defib_zap.ogg', 50, 1)
..()
code/modules/reagents/reagent_containers/borghydro.dm
+1 -1
View File
@@ -180,7 +180,7 @@ Borg Shaker
recharge_time = 3
accepts_reagent_upgrades = FALSE
reagent_ids = list("beer", "orangejuice", "grenadine" ,"limejuice", "tomatojuice", "cola", "tonic", "sodawater", "ice", "cream", "whiskey", "vodka", "rum", "gin", "tequila", "vermouth", "wine", "kahlua", "cognac", "ale")
reagent_ids = list("beer", "orangejuice", "grenadine" ,"limejuice", "tomatojuice", "cola", "tonic", "sodawater", "ice", "cream", "whiskey", "vodka", "rum", "gin", "tequila", "vermouth", "wine", "kahlua", "cognac", "ale", "fernet")
/obj/item/reagent_containers/borghypo/borgshaker/attack(mob/M, mob/user)
return //Can't inject stuff with a shaker, can we? //not with that attitude