cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-28 07:20:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Major UT Overhaul (#16544)

Browse Source 
* Removes old UT definition files (drone/travis)
* Adds concurrency definitions to the workflows
* Changes our workflows to be more in line with what /tg does
* Adds a workflow to build/commit TGUI
* Adds a workflow to build/commit changelogs

Add python version to dependencies.sh
Fix dme errors
Removes a bunch of not included files
Cache Opendream and add directory to check_grep.py

Co-authored-by: Werner <Arrow768@users.noreply.github.com>
This commit is contained in:
Werner
2023-06-27 16:44:16 +02:00
committed by GitHub
co-authored by Werner
parent 1e0c7d8dd2
commit 3742231bc2
205 changed files with 1433 additions and 7692 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/bot/farmbot.dm
+7
View File
@@ -385,3 +385,10 @@
/obj/item/farmbot_arm_assembly/attack_hand(mob/user)
return //it's a converted watertank, no you cannot pick it up and put it in your backpack
#undef FARMBOT_COLLECT
#undef FARMBOT_WATER
#undef FARMBOT_UPROOT
#undef FARMBOT_NUTRIMENT
#undef FARMBOT_PESTKILL
code/modules/mob/living/carbon/human/chem_side_effects.dm
-149
View File
@@ -1,149 +0,0 @@
// MEDICAL SIDE EFFECT BASE
// ========================
/datum/medical_effect
var/name = "None"
var/strength = 0
var/start = 0
var/list/triggers
var/list/cures
var/cure_message
/datum/medical_effect/proc/manifest(mob/living/carbon/human/H)
for(var/R in cures)
if(H.reagents.has_reagent(R))
return 0
for(var/R in triggers)
if(REAGENT_VOLUME(H.reagents, R) >= triggers[R])
return 1
return 0
/datum/medical_effect/proc/on_life(mob/living/carbon/human/H, strength)
return
/datum/medical_effect/proc/cure(mob/living/carbon/human/H)
for(var/R in cures)
if(H.reagents.has_reagent(R))
if (cure_message)
to_chat(H, "<span class='notice'>[cure_message]</span>")
return 1
return 0
// MOB HELPERS
// ===========
/mob/living/carbon/human/var/list/datum/medical_effect/side_effects = list()
/mob/proc/add_side_effect(name, strength = 0)
/mob/living/carbon/human/add_side_effect(name, strength = 0)
for(var/datum/medical_effect/M in src.side_effects)
if(M.name == name)
M.strength = max(M.strength, 10)
M.start = life_tick
return
var/T = side_effects[name]
if (!T)
return
var/datum/medical_effect/M = new T
if(M.name == name)
M.strength = strength
M.start = life_tick
side_effects += M
/mob/living/carbon/human/proc/handle_medical_side_effects()
//Going to handle those things only every few ticks.
if(life_tick % 15 != 0)
return 0
var/list/L = typesof(/datum/medical_effect)-/datum/medical_effect
for(var/T in L)
var/datum/medical_effect/M = new T
if (M.manifest(src))
src.add_side_effect(M.name)
// One full cycle(in terms of strength) every 10 minutes
for (var/datum/medical_effect/M in side_effects)
if (!M) continue
var/strength_percent = sin((life_tick - M.start) / 2)
// Only do anything if the effect is currently strong enough
if(strength_percent >= 0.4)
if (M.cure(src) || M.strength > 50)
side_effects -= M
M = null
else
if(life_tick % 45 == 0)
M.on_life(src, strength_percent*M.strength)
// Effect slowly growing stronger
M.strength+=0.08
// HEADACHE
// ========
/datum/medical_effect/headache
name = "Headache"
triggers = list(/singleton/reagent/cryoxadone = 10, /singleton/reagent/bicaridine = 15, /singleton/reagent/tricordrazine = 15)
cures = list(/singleton/reagent/alkysine, /singleton/reagent/mortaphenyl, /singleton/reagent/perconol, /singleton/reagent/oxycomorphine)
cure_message = "Your head stops throbbing..."
/datum/medical_effect/headache/on_life(mob/living/carbon/human/H, strength)
switch(strength)
if(1 to 10)
H.custom_pain("You feel a light pain in your head.",0)
if(11 to 30)
H.custom_pain("You feel a throbbing pain in your head!",1)
if(31 to INFINITY)
H.custom_pain("You feel an excrutiating pain in your head!",1)
// BAD STOMACH
// ===========
/datum/medical_effect/bad_stomach
name = "Bad Stomach"
triggers = list(/singleton/reagent/kelotane = 30, /singleton/reagent/dermaline = 15)
cures = list(/singleton/reagent/dylovene)
cure_message = "Your stomach feels a little better now..."
/datum/medical_effect/bad_stomach/on_life(mob/living/carbon/human/H, strength)
switch(strength)
if(1 to 10)
H.custom_pain("You feel a bit light around the stomach.",0)
if(11 to 30)
H.custom_pain("Your stomach hurts.",0)
if(31 to INFINITY)
H.custom_pain("You feel sick.",1)
// CRAMPS
// ======
/datum/medical_effect/cramps
name = "Cramps"
triggers = list(/singleton/reagent/dylovene = 30, /singleton/reagent/mortaphenyl = 15)
cures = list(/singleton/reagent/inaprovaline)
cure_message = "The cramps let up..."
/datum/medical_effect/cramps/on_life(mob/living/carbon/human/H, strength)
switch(strength)
if(1 to 10)
H.custom_pain("The muscles in your body hurt a little.",0)
if(11 to 30)
H.custom_pain("The muscles in your body cramp up painfully.",0)
if(31 to INFINITY)
H.visible_message("<b>[H]</b> flinches!")
H.custom_pain("There's pain all over your body!",1)
// ITCH
// ====
/datum/medical_effect/itch
name = "Itch"
triggers = list(/singleton/reagent/space_drugs = 10)
cures = list(/singleton/reagent/inaprovaline)
cure_message = "The itching stops..."
/datum/medical_effect/itch/on_life(mob/living/carbon/human/H, strength)
switch(strength)
if(1 to 10)
H.custom_pain("You feel a slight itch.",0)
if(11 to 30)
H.custom_pain("You want to scratch your itch badly.",0)
if(31 to INFINITY)
H.visible_message("<b>[H]</b> shivers slightly.")
H.custom_pain("This itch makes it really hard to concentrate.",1)
code/modules/mob/living/carbon/human/examine.dm
-3
View File
@@ -1,6 +1,3 @@
#define SEC_HUDTYPE "security"
#define MED_HUDTYPE "medical"
/mob/living/carbon/human/proc/get_covered_body_parts(var/thick)
var/skipbody = 0
for(var/obj/item/clothing/C in list(wear_suit, head, wear_mask, w_uniform, gloves, shoes))
code/modules/mob/living/silicon/laws.dm
+1 -3
View File
@@ -1,5 +1,3 @@
#define DEFAULT_LAW_CHANNEL "Main Frequency"
/mob/living/silicon/proc/laws_sanity_check()
if(!src.laws)
laws = new base_law_type
@@ -106,4 +104,4 @@
/mob/living/silicon/proc/log_law(var/law_message)
log_and_message_admins(law_message)
lawchanges += "[worldtime2text()] - [usr ? "[key_name(usr)]" : "EVENT"] [law_message]"
lawchanges += "[worldtime2text()] - [usr ? "[key_name(usr)]" : "EVENT"] [law_message]"
code/modules/mob/living/silicon/robot/robot.dm
+2
View File
@@ -1294,3 +1294,5 @@
/mob/living/silicon/robot/GetIdCard()
return id_card
#undef CYBORG_POWER_USAGE_MULTIPLIER
code/modules/mob/living/silicon/silicon.dm
-4
View File
@@ -1,7 +1,3 @@
#define NO_HUD 0
#define SEC_HUD 1
#define MED_HUD 2
/mob/living/silicon
// Speaking
gender = NEUTER
code/modules/mob/living/simple_animal/friendly/ratking.dm
+9
View File
@@ -283,3 +283,12 @@
if(rats.len >= RAT_KING_LEVEL)
return 1
return 0
#undef RAT_MAYOR_LEVEL
#undef RAT_BARON_LEVEL
#undef RAT_DUKE_LEVEL
#undef RAT_KING_LEVEL
#undef RAT_EMPEROR_LEVEL
#undef RAT_SAVIOR_LEVEL
#undef RAT_GOD_LEVEL
code/modules/mob/living/simple_animal/friendly/schlorrgo.dm
+7
View File
@@ -320,3 +320,10 @@
new /obj/effect/gibspawner/generic(T)
explosion(T, -1, 0, 2)
qdel(src)
#undef EGG_SCHLORRGO
#undef BABY_SCHLORRGO
#undef NORMAL_SCHLORRGO
#undef FAT_SCHLORRGO
#undef WIDE_SCHLORRGO
#undef COLOSSAL_SCHLORRGO
code/modules/mob/mob_grab.dm
-4
View File
@@ -1,7 +1,3 @@
#define UPGRADE_COOLDOWN 40
#define UPGRADE_KILL_TIMER 100
//This is called from human_attackhand.dm before grabbing happens.
//IT is called when grabber tries to grab this mob
//Override this for special grab behaviour.