cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-21 02:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9086 from tigercat2000/spacemandmm_fixes

Browse Source 
Macro Refactor for SpacemanDMM
This commit is contained in:
Fox McCloud
2018-06-03 19:45:33 -04:00
committed by GitHub
parent 3cb8529daf 5ace5944d9
commit 482904befc
25 changed files with 41 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/alarm/alarm.dm
-2
View File
@@ -134,5 +134,3 @@
/mob/living/silicon/robot/syndicate/get_alarm_cameras()
return list()
#undef ALARM_LOSS_DELAY
code/modules/awaymissions/mission_code/spacehotel.dm
+1 -3
View File
@@ -299,6 +299,4 @@
return
S.retal_target = target
S.retal = 1
#undef CHECKOUT_TIME
S.retal = 1
code/modules/client/preference/preferences.dm
+2 -8
View File
@@ -54,15 +54,9 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
return max(0, days - C.player_age)
return 0
//used for alternate_option
#define GET_RANDOM_JOB 0
#define BE_CIVILIAN 1
#define RETURN_TO_LOBBY 2
#define MAX_SAVE_SLOTS 20 // Save slots for regular players
#define MAX_SAVE_SLOTS_MEMBER 20 // Save slots for BYOND members
#define TAB_CHAR 0
#define TAB_GAME 1
#define TAB_GEAR 2
@@ -699,7 +693,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
switch(alternate_option)
if(GET_RANDOM_JOB)
HTML += "<center><br><u><a href='?_src_=prefs;preference=job;task=random'><font color=white>Get random job if preferences unavailable</font></a></u></center><br>"
if(BE_CIVILIAN)
if(BE_ASSISTANT)
HTML += "<center><br><u><a href='?_src_=prefs;preference=job;task=random'><font color=white>Be a civilian if preferences unavailable</font></a></u></center><br>"
if(RETURN_TO_LOBBY)
HTML += "<center><br><u><a href='?_src_=prefs;preference=job;task=random'><font color=white>Return to lobby if preferences unavailable</font></a></u></center><br>"
@@ -1051,7 +1045,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
ResetJobs()
SetChoices(user)
if("random")
if(alternate_option == GET_RANDOM_JOB || alternate_option == BE_CIVILIAN)
if(alternate_option == GET_RANDOM_JOB || alternate_option == BE_ASSISTANT)
alternate_option += 1
else if(alternate_option == RETURN_TO_LOBBY)
alternate_option = 0
code/modules/clothing/masks/miscellaneous.dm
+3 -3
View File
@@ -8,7 +8,7 @@
gas_transfer_coefficient = 0.90
put_on_delay = 20
var/resist_time = 0 //deciseconds of how long you need to gnaw to get rid of the gag, 0 to make it impossible to remove
var/mute = MUTE_ALL
var/mute = MUZZLE_MUTE_ALL
var/security_lock = FALSE // Requires brig access to remove 0 - Remove as normal
var/locked = FALSE //Indicates if a mask is locked, should always start as 0.
species_fit = list("Vox")
@@ -93,7 +93,7 @@
item_state = null
w_class = WEIGHT_CLASS_TINY
resist_time = 150
mute = MUTE_MUFFLE
mute = MUZZLE_MUTE_MUFFLE
flags = DROPDEL
species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin", "Grey")
sprite_sheets = list(
@@ -117,7 +117,7 @@
name = "safety muzzle"
desc = "A muzzle designed to prevent biting."
resist_time = 600
mute = MUTE_NONE
mute = MUZZLE_MUTE_NONE
security_lock = TRUE
locked = FALSE
code/modules/economy/Economy.dm
+1 -1
View File
@@ -38,7 +38,7 @@
#define MINERALS 8
#define EMERGENCY 9
#define GAS 10
#define EGAS 10
#define MAINTENANCE 11
#define ELECTRICAL 12
#define ROBOTICS 13
code/modules/economy/Economy_Events.dm
+3 -3
View File
@@ -29,16 +29,16 @@
if(INDUSTRIAL_ACCIDENT)
dearer_goods = list(EMERGENCY, BIOMEDICAL, ROBOTICS)
if(BIOHAZARD_OUTBREAK)
dearer_goods = list(BIOMEDICAL, GAS)
dearer_goods = list(BIOMEDICAL, EGAS)
if(PIRATES)
dearer_goods = list(SECURITY, MINERALS)
if(CORPORATE_ATTACK)
dearer_goods = list(SECURITY, MAINTENANCE)
if(ALIEN_RAIDERS)
dearer_goods = list(BIOMEDICAL, ANIMALS)
cheaper_goods = list(GAS, MINERALS)
cheaper_goods = list(EGAS, MINERALS)
if(AI_LIBERATION)
dearer_goods = list(EMERGENCY, GAS, MAINTENANCE)
dearer_goods = list(EMERGENCY, EGAS, MAINTENANCE)
if(MOURNING)
cheaper_goods = list(MINERALS, MAINTENANCE)
if(CULT_CELL_REVEALED)
code/modules/events/infestation.dm
-1
View File
@@ -107,7 +107,6 @@
#undef LOC_HYDRO
#undef LOC_VAULT
#undef LOC_TECH
#undef LOC_TACTICAL
#undef VERM_MICE
#undef VERM_LIZARDS
code/modules/mob/living/carbon/alien/alien.dm
-8
View File
@@ -1,7 +1,3 @@
#define HEAT_DAMAGE_LEVEL_1 2 //Amount of damage applied when your body temperature just passes the 360.15k safety point
#define HEAT_DAMAGE_LEVEL_2 3 //Amount of damage applied when your body temperature passes the 400K point
#define HEAT_DAMAGE_LEVEL_3 8 //Amount of damage applied when your body temperature passes the 1000K point
/mob/living/carbon/alien
name = "alien"
voice_name = "alien"
@@ -229,10 +225,6 @@ Des: Removes all infected images from the alien.
/mob/living/carbon/alien/can_use_vents()
return
#undef HEAT_DAMAGE_LEVEL_1
#undef HEAT_DAMAGE_LEVEL_2
#undef HEAT_DAMAGE_LEVEL_3
/mob/living/carbon/alien/handle_footstep(turf/T)
if(..())
if(T.footstep_sounds["xeno"])
code/modules/mob/living/carbon/alien/humanoid/update_icons.dm
+2 -2
View File
@@ -3,7 +3,7 @@
#define X_SUIT_LAYER 2
#define X_L_HAND_LAYER 3
#define X_R_HAND_LAYER 4
#define TARGETED_LAYER 5
#define X_TARGETED_LAYER 5
#define X_FIRE_LAYER 6
#define X_TOTAL_LAYERS 6
/////////////////////////////////
@@ -161,6 +161,6 @@
#undef X_SUIT_LAYER
#undef X_L_HAND_LAYER
#undef X_R_HAND_LAYER
#undef TARGETED_LAYER
#undef X_TARGETED_LAYER
#undef X_FIRE_LAYER
#undef X_TOTAL_LAYERS
code/modules/mob/living/carbon/human/update_icons.dm
+1 -1
View File
@@ -205,7 +205,7 @@ var/global/list/damage_icon_parts = list()
DI = damage_icon_parts[cache_index]
standing_image.overlays += DI
overlays_standing[DAMAGE_LAYER] = standing_image
overlays_standing[H_DAMAGE_LAYER] = standing_image
if(update_icons) update_icons()
code/modules/mob/living/say.dm
+2 -2
View File
@@ -164,10 +164,10 @@ proc/get_radio_key_from_channel(var/channel)
if(is_muzzled())
var/obj/item/clothing/mask/muzzle/G = wear_mask
if(G.mute == MUTE_ALL) //if the mask is supposed to mute you completely or just muffle you
if(G.mute == MUZZLE_MUTE_ALL) //if the mask is supposed to mute you completely or just muffle you
to_chat(src, "<span class='danger'>You're muzzled and cannot speak!</span>")
return
else if(G.mute == MUTE_MUFFLE)
else if(G.mute == MUZZLE_MUTE_MUFFLE)
message = muffledspeech(message)
verb = "mumbles"
code/modules/power/smes.dm
-2
View File
@@ -224,8 +224,6 @@
/obj/machinery/power/smes/proc/chargedisplay()
return round(5.5*charge/(capacity ? capacity : 5e6))
#define SMESRATE 0.05
/obj/machinery/power/smes/process()
if(stat & BROKEN) return
code/modules/reagents/chemistry/machinery/chem_dispenser.dm
-4
View File
@@ -1,7 +1,3 @@
#define SOLID 1
#define LIQUID 2
#define GAS 3
/obj/machinery/chem_dispenser
name = "chem dispenser"
density = 1
code/modules/shuttle/shuttle.dm
+2 -1
View File
@@ -1,4 +1,5 @@
//use this define to highlight docking port bounding boxes (ONLY FOR DEBUG USE)
// also uncomment the #undef at the bottom of the file
//#define DOCKING_PORT_HIGHLIGHT
//NORTH default dir
@@ -909,7 +910,7 @@ var/global/trade_dockrequest_timelimit = 0
shuttleId = "trade_sol"
docking_request_message = "A trading ship of Sol origin has requested docking aboard the NSS Cyberiad for trading. This request can be accepted or denied using a communications console."
#undef DOCKING_PORT_HIGHLIGHT
//#undef DOCKING_PORT_HIGHLIGHT
/turf/proc/copyTurf(turf/T)
code/modules/spacepods/spacepod.dm
+8 -8
View File
@@ -1,6 +1,6 @@
#define DAMAGE 1
#define FIRE 2
#define LIGHT 1
#define POD_LIGHT 1
#define WINDOW 2
#define RIM 3
#define PAINT 4
@@ -78,7 +78,7 @@
var/part = input(user, "Choose part", null) as null|anything in list("Lights","Rim","Paint","Windows")
switch(part)
if("Lights")
part_type = LIGHT
part_type = POD_LIGHT
if("Rim")
part_type = RIM
if("Paint")
@@ -101,7 +101,7 @@
pod_overlays[FIRE] = image(icon, icon_state="pod_fire")
if(!pod_paint_effect)
pod_paint_effect = new/list(4)
pod_paint_effect[LIGHT] = image(icon,icon_state = "LIGHTS")
pod_paint_effect[POD_LIGHT] = image(icon,icon_state = "LIGHTS")
pod_paint_effect[WINDOW] = image(icon,icon_state = "Windows")
pod_paint_effect[RIM] = image(icon,icon_state = "RIM")
pod_paint_effect[PAINT] = image(icon,icon_state = "PAINT")
@@ -162,7 +162,7 @@
if(!pod_paint_effect)
pod_paint_effect = new/list(4)
pod_paint_effect[LIGHT] = image(icon,icon_state = "LIGHTS")
pod_paint_effect[POD_LIGHT] = image(icon,icon_state = "LIGHTS")
pod_paint_effect[WINDOW] = image(icon,icon_state = "Windows")
pod_paint_effect[RIM] = image(icon,icon_state = "RIM")
pod_paint_effect[PAINT] = image(icon,icon_state = "PAINT")
@@ -170,9 +170,9 @@
if(has_paint)
var/image/to_add
if(!isnull(pod_paint_effect[LIGHT]))
to_add = pod_paint_effect[LIGHT]
to_add.color = colors[LIGHT]
if(!isnull(pod_paint_effect[POD_LIGHT]))
to_add = pod_paint_effect[POD_LIGHT]
to_add.color = colors[POD_LIGHT]
overlays += to_add
if(!isnull(pod_paint_effect[WINDOW]))
to_add = pod_paint_effect[WINDOW]
@@ -1077,6 +1077,6 @@ obj/spacepod/proc/add_equipment(mob/user, var/obj/item/spacepod_equipment/SPE, v
#undef DAMAGE
#undef FIRE
#undef WINDOW
#undef LIGHT
#undef POD_LIGHT
#undef RIM
#undef PAINT
code/modules/surgery/organs/organ_external.dm
-1
View File
@@ -239,7 +239,6 @@
#undef LIMB_SHARP_THRESH_INT_DMG
#undef LIMB_THRESH_INT_DMG
#undef LIMB_DMG_PROB
#undef LIMB_NO_BONE_DMG_PROB
/obj/item/organ/external/proc/heal_damage(brute, burn, internal = 0, robo_repair = 0)
if(status & ORGAN_ROBOT && !robo_repair)