mirror of
https://github.com/yogstation13/Yogstation.git
synced 2025-02-26 09:04:50 +00:00
Revert "Merge remote-tracking branch 'upstream/master' into icon_smoothing"
This reverts commit863e1b776d, reversing changes made to884623e600.
This commit is contained in:
Chubbygummibear
@@ -68,14 +68,6 @@
|
||||
},
|
||||
/turf/open/floor/carpet/red,
|
||||
/area/chapel/office)
|
||||
"cH" = (
|
||||
/obj/effect/turf_decal/ramp_middle,
|
||||
/obj/machinery/camera{
|
||||
c_tag = "Chapel South";
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/chapel/main)
|
||||
"dd" = (
|
||||
/obj/machinery/door/airlock/public/glass{
|
||||
name = "Chapel"
|
||||
@@ -255,6 +247,14 @@
|
||||
/obj/item/reagent_containers/food/snacks/grown/poppy,
|
||||
/turf/open/floor/plating,
|
||||
/area/chapel/office)
|
||||
"kU" = (
|
||||
/obj/effect/turf_decal/ramp_middle,
|
||||
/obj/machinery/camera{
|
||||
c_tag = "Atmospherics East";
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/chapel/main)
|
||||
"ln" = (
|
||||
/obj/machinery/door/firedoor/border_only{
|
||||
dir = 4
|
||||
@@ -284,13 +284,6 @@
|
||||
/obj/structure/chair/wood/normal,
|
||||
/turf/open/floor/carpet/red,
|
||||
/area/chapel/main)
|
||||
"nm" = (
|
||||
/obj/structure/table/wood/fancy/black,
|
||||
/obj/machinery/camera{
|
||||
c_tag = "Chapel Central"
|
||||
},
|
||||
/turf/open/floor/carpet/black,
|
||||
/area/chapel/main)
|
||||
"oG" = (
|
||||
/obj/structure/table/wood/fancy,
|
||||
/obj/structure/railing{
|
||||
@@ -346,6 +339,14 @@
|
||||
dir = 8
|
||||
},
|
||||
/area/chapel/main)
|
||||
"rx" = (
|
||||
/obj/structure/table/wood/fancy/black,
|
||||
/obj/machinery/camera{
|
||||
c_tag = "Testing Lab East";
|
||||
network = list("ss13","rd")
|
||||
},
|
||||
/turf/open/floor/carpet/black,
|
||||
/area/chapel/main)
|
||||
"rG" = (
|
||||
/obj/effect/turf_decal/ramp_middle{
|
||||
dir = 8
|
||||
@@ -375,24 +376,6 @@
|
||||
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/chapel/main)
|
||||
"uR" = (
|
||||
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/cable{
|
||||
icon_state = "0-8"
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
areastring = "/area/chapel/office";
|
||||
name = "Chapel Office APC";
|
||||
pixel_y = -23
|
||||
},
|
||||
/obj/machinery/camera{
|
||||
c_tag = "Chapel Crematorium";
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/chapel/office)
|
||||
"vK" = (
|
||||
/obj/structure/table/wood/fancy,
|
||||
/obj/structure/railing{
|
||||
@@ -490,17 +473,6 @@
|
||||
dir = 1
|
||||
},
|
||||
/area/chapel/main)
|
||||
"BR" = (
|
||||
/obj/effect/turf_decal/ramp_middle{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/camera{
|
||||
c_tag = "Chapel North"
|
||||
},
|
||||
/turf/open/floor/plasteel/stairs/goon/dark_stairs_wide{
|
||||
dir = 4
|
||||
},
|
||||
/area/chapel/main)
|
||||
"Cq" = (
|
||||
/obj/item/kirbyplants/random,
|
||||
/turf/open/floor/plasteel/dark,
|
||||
@@ -695,9 +667,40 @@
|
||||
},
|
||||
/turf/open/floor/carpet/black,
|
||||
/area/chapel/main)
|
||||
"Im" = (
|
||||
/obj/effect/turf_decal/ramp_middle{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/camera{
|
||||
c_tag = "Testing Lab East";
|
||||
network = list("ss13","rd")
|
||||
},
|
||||
/turf/open/floor/plasteel/stairs/goon/dark_stairs_wide{
|
||||
dir = 4
|
||||
},
|
||||
/area/chapel/main)
|
||||
"IL" = (
|
||||
/turf/open/floor/carpet/red,
|
||||
/area/chapel/main)
|
||||
"IS" = (
|
||||
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/cable{
|
||||
icon_state = "0-8"
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
areastring = "/area/chapel/office";
|
||||
name = "Chapel Office APC";
|
||||
pixel_y = -23
|
||||
},
|
||||
/obj/machinery/camera{
|
||||
c_tag = "Prison Common Room South";
|
||||
dir = 1;
|
||||
network = list("ss13","prison")
|
||||
},
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/chapel/office)
|
||||
"Jc" = (
|
||||
/obj/structure/closet/crate/coffin,
|
||||
/obj/structure/window/reinforced{
|
||||
@@ -1229,7 +1232,7 @@ kI
|
||||
kI
|
||||
kI
|
||||
xL
|
||||
BR
|
||||
Im
|
||||
FB
|
||||
iO
|
||||
xL
|
||||
@@ -1343,7 +1346,7 @@ NN
|
||||
Kc
|
||||
VJ
|
||||
zg
|
||||
nm
|
||||
rx
|
||||
Pv
|
||||
FD
|
||||
Lo
|
||||
@@ -1381,7 +1384,7 @@ dR
|
||||
(13,1,1) = {"
|
||||
zg
|
||||
Nh
|
||||
uR
|
||||
IS
|
||||
zg
|
||||
Cv
|
||||
im
|
||||
@@ -1436,7 +1439,7 @@ EV
|
||||
qK
|
||||
EV
|
||||
Tc
|
||||
cH
|
||||
kU
|
||||
Df
|
||||
sy
|
||||
tP
|
||||
|
||||
@@ -957,6 +957,10 @@
|
||||
/obj/item/wrench,
|
||||
/turf/open/space/basic,
|
||||
/area/engine/engineering)
|
||||
"Rn" = (
|
||||
/obj/machinery/the_singularitygen,
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/engine/engineering)
|
||||
"Rw" = (
|
||||
/obj/machinery/power/rad_collector,
|
||||
/obj/structure/cable/orange{
|
||||
@@ -1033,6 +1037,10 @@
|
||||
/obj/structure/sign/warning/securearea,
|
||||
/turf/closed/wall/r_wall,
|
||||
/area/engine/engineering)
|
||||
"XG" = (
|
||||
/obj/machinery/the_singularitygen/tesla,
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/engine/engineering)
|
||||
"Zr" = (
|
||||
/obj/structure/cable/yellow{
|
||||
icon_state = "1-2"
|
||||
@@ -1505,7 +1513,7 @@ gm
|
||||
gm
|
||||
gm
|
||||
yi
|
||||
yi
|
||||
XG
|
||||
yi
|
||||
kU
|
||||
kU
|
||||
@@ -1561,7 +1569,7 @@ sd
|
||||
kU
|
||||
kU
|
||||
yi
|
||||
yi
|
||||
Rn
|
||||
yi
|
||||
gm
|
||||
gm
|
||||
|
||||
@@ -7,6 +7,5 @@
|
||||
"cargo": "cargo_gax",
|
||||
"ferry": "ferry_fancy",
|
||||
"emergency": "emergency_box"
|
||||
},
|
||||
"cryo_spawn": true
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -506,6 +506,8 @@
|
||||
for(var/datum/department_goal/dg in SSYogs.department_goals)
|
||||
goals[dg.account] += dg.get_result()
|
||||
|
||||
parts += "<br>Money diverted from non-human paychecks by NT: $[GLOB.stolen_paycheck_money]<br>"
|
||||
|
||||
parts += "<br>[span_header("Engineering department goals:")]<br>"
|
||||
parts += goals[ACCOUNT_ENG]
|
||||
|
||||
|
||||
@@ -68,8 +68,6 @@
|
||||
|
||||
/datum/config_entry/flag/disable_human_mood
|
||||
|
||||
/datum/config_entry/flag/force_human_mood // force every human to have mood enabled, this overwrites disabling it.
|
||||
|
||||
/datum/config_entry/flag/disable_secborg // disallow secborg module to be chosen.
|
||||
|
||||
/datum/config_entry/flag/disable_peaceborg
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
GLOBAL_VAR_INIT(stolen_paycheck_money, 0)
|
||||
|
||||
|
||||
SUBSYSTEM_DEF(economy)
|
||||
name = "Economy"
|
||||
wait = 5 MINUTES
|
||||
|
||||
@@ -893,66 +893,38 @@ SUBSYSTEM_DEF(job)
|
||||
return
|
||||
|
||||
//bad mojo
|
||||
if(SSmapping.config.cryo_spawn)
|
||||
var/area/shuttle/arrival/A = GLOB.areas_by_type[/area/crew_quarters/cryopods]
|
||||
if(A)
|
||||
var/list/pods = list()
|
||||
var/list/unoccupied_pods = list()
|
||||
for(var/obj/machinery/cryopod/pod in A)
|
||||
pods |= pod
|
||||
if(!pod.occupant)
|
||||
unoccupied_pods |= pod
|
||||
if(length(unoccupied_pods)) //if we have any unoccupied ones
|
||||
destination = pick(unoccupied_pods)
|
||||
else if(length(pods))
|
||||
destination = pick(pods) //if they're all full somehow??
|
||||
else //no pods at all
|
||||
var/list/available = list()
|
||||
for(var/turf/T in A)
|
||||
if(!T.is_blocked_turf(TRUE))
|
||||
available += T
|
||||
if(length(available))
|
||||
destination = pick(available)
|
||||
if(destination)
|
||||
destination.JoinPlayerHere(M, FALSE)
|
||||
else
|
||||
var/msg = "Unable to send mob [M] to late join (CRYOPODS)!"
|
||||
message_admins(msg)
|
||||
CRASH(msg)
|
||||
var/area/shuttle/arrival/A = GLOB.areas_by_type[/area/shuttle/arrival]
|
||||
if(A)
|
||||
//first check if we can find a chair
|
||||
var/obj/structure/chair/C = locate() in A
|
||||
if(C)
|
||||
C.JoinPlayerHere(M, buckle)
|
||||
return
|
||||
|
||||
//last hurrah
|
||||
var/list/avail = list()
|
||||
for(var/turf/T in A)
|
||||
if(!T.is_blocked_turf(TRUE))
|
||||
avail += T
|
||||
if(avail.len)
|
||||
destination = pick(avail)
|
||||
destination.JoinPlayerHere(M, FALSE)
|
||||
return
|
||||
|
||||
//pick an open spot on arrivals and dump em
|
||||
var/list/arrivals_turfs = shuffle(get_area_turfs(/area/shuttle/arrival))
|
||||
if(arrivals_turfs.len)
|
||||
for(var/turf/T in arrivals_turfs)
|
||||
if(!T.is_blocked_turf(TRUE))
|
||||
T.JoinPlayerHere(M, FALSE)
|
||||
return
|
||||
//last chance, pick ANY spot on arrivals and dump em
|
||||
destination = arrivals_turfs[1]
|
||||
destination.JoinPlayerHere(M, FALSE)
|
||||
else
|
||||
var/area/shuttle/arrival/A = GLOB.areas_by_type[/area/shuttle/arrival]
|
||||
if(A)
|
||||
//first check if we can find a chair
|
||||
var/obj/structure/chair/C = locate() in A
|
||||
if(C)
|
||||
C.JoinPlayerHere(M, buckle)
|
||||
return
|
||||
|
||||
//last hurrah
|
||||
var/list/avail = list()
|
||||
for(var/turf/T in A)
|
||||
if(!T.is_blocked_turf(TRUE))
|
||||
avail += T
|
||||
if(avail.len)
|
||||
destination = pick(avail)
|
||||
destination.JoinPlayerHere(M, FALSE)
|
||||
return
|
||||
|
||||
//pick an open spot on arrivals and dump em
|
||||
var/list/arrivals_turfs = shuffle(get_area_turfs(/area/shuttle/arrival))
|
||||
if(arrivals_turfs.len)
|
||||
for(var/turf/T in arrivals_turfs)
|
||||
if(!T.is_blocked_turf(TRUE))
|
||||
T.JoinPlayerHere(M, FALSE)
|
||||
return
|
||||
//last chance, pick ANY spot on arrivals and dump em
|
||||
destination = arrivals_turfs[1]
|
||||
destination.JoinPlayerHere(M, FALSE)
|
||||
else
|
||||
var/msg = "Unable to send mob [M] to late join!"
|
||||
message_admins(msg)
|
||||
CRASH(msg)
|
||||
var/msg = "Unable to send mob [M] to late join!"
|
||||
message_admins(msg)
|
||||
CRASH(msg)
|
||||
|
||||
///Lands specified mob at a random spot in the hallways
|
||||
/datum/controller/subsystem/job/proc/DropLandAtRandomHallwayPoint(mob/living/living_mob)
|
||||
|
||||
@@ -436,7 +436,6 @@ GLOBAL_LIST_EMPTY(the_station_areas)
|
||||
else
|
||||
for(var/M in global.config.maplist)
|
||||
mapvotes[M] = 1
|
||||
var/previous_maps = get_map_weights()
|
||||
|
||||
//filter votes
|
||||
for (var/map in mapvotes)
|
||||
@@ -458,9 +457,6 @@ GLOBAL_LIST_EMPTY(the_station_areas)
|
||||
if (VM.config_max_users > 0 && players > VM.config_max_users)
|
||||
mapvotes.Remove(map)
|
||||
continue
|
||||
if(previous_maps[VM.map_name] > 7)
|
||||
mapvotes.Remove(map)
|
||||
continue
|
||||
|
||||
if(pmv)
|
||||
mapvotes[map] = mapvotes[map]*VM.voteweight
|
||||
@@ -860,27 +856,3 @@ GLOBAL_LIST_EMPTY(the_station_areas)
|
||||
/datum/controller/subsystem/mapping/proc/get_reservation_from_turf(turf/T)
|
||||
RETURN_TYPE(/datum/turf_reservation)
|
||||
return used_turfs[T]
|
||||
|
||||
|
||||
/datum/controller/subsystem/mapping/proc/get_map_weights()
|
||||
var/list/previous_maps = list()
|
||||
if(SSdbcore.Connect())
|
||||
var/datum/DBQuery/query_previous_maps = SSdbcore.NewQuery({"
|
||||
SELECT map_name FROM [format_table_name("round")] WHERE id BETWEEN lower = :lower AND upper = :upper
|
||||
"}, list("lower" = "[text2num(GLOB.round_id) - 9]", "upper" = GLOB.round_id))
|
||||
if(!query_previous_maps.Execute())
|
||||
qdel(query_previous_maps)
|
||||
for(var/i = 1 to 10)
|
||||
var/next_map = query_previous_maps.NextRow()
|
||||
if(!next_map)
|
||||
continue
|
||||
previous_maps[next_map[1]] += 1 / (11 - i) //this lessens the influence of rounds that were longer ago
|
||||
qdel(query_previous_maps)
|
||||
return previous_maps
|
||||
|
||||
/client/proc/DebugMapWeights()
|
||||
set name = "See Map Weights"
|
||||
set category = "Misc.Server Debug"
|
||||
var/weights = SSmapping.get_map_weights()
|
||||
for(var/key in weights)
|
||||
to_chat(src, "[key]: weights[key]")
|
||||
|
||||
@@ -190,7 +190,6 @@ SUBSYSTEM_DEF(vote)
|
||||
if(!lower_admin && SSmapping.map_voted)
|
||||
to_chat(usr, span_warning("The next map has already been selected."))
|
||||
return FALSE
|
||||
var/list/previous_maps = SSmapping.get_map_weights()
|
||||
// Randomizes the list so it isn't always METASTATION
|
||||
var/list/maps = list()
|
||||
for(var/map in global.config.maplist)
|
||||
@@ -201,8 +200,6 @@ SUBSYSTEM_DEF(vote)
|
||||
continue
|
||||
if(VM.config_max_users > 0 && GLOB.clients.len > VM.config_max_users)
|
||||
continue
|
||||
if(previous_maps[VM.map_name] > 7)
|
||||
continue
|
||||
maps += VM.map_name
|
||||
shuffle_inplace(maps)
|
||||
for(var/valid_map in maps)
|
||||
|
||||
@@ -24,7 +24,6 @@
|
||||
var/space_empty_levels = 1
|
||||
|
||||
var/minetype = "lavaland"
|
||||
var/cryo_spawn = FALSE
|
||||
|
||||
var/allow_custom_shuttles = TRUE
|
||||
var/shuttles = list(
|
||||
@@ -136,9 +135,6 @@
|
||||
if ("minetype" in json)
|
||||
minetype = json["minetype"]
|
||||
|
||||
if("cryo_spawn" in json)
|
||||
cryo_spawn = json["cryo_spawn"]
|
||||
|
||||
allow_custom_shuttles = json["allow_custom_shuttles"] != FALSE
|
||||
|
||||
#ifdef UNIT_TESTS
|
||||
|
||||
@@ -432,27 +432,3 @@ GLOBAL_VAR_INIT(cryopods_enabled, FALSE)
|
||||
log_admin(span_notice("[key_name(target)] entered a stasis pod."))
|
||||
message_admins("[key_name_admin(target)] entered a stasis pod. (<A HREF='?_src_=holder;[HrefToken()];adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)")
|
||||
add_fingerprint(target)
|
||||
|
||||
/obj/machinery/cryopod/JoinPlayerHere(mob/M, buckle)
|
||||
. = ..()
|
||||
open_machine()
|
||||
if(iscarbon(M))
|
||||
apply_effects_to_mob(M)
|
||||
|
||||
/obj/machinery/cryopod/proc/apply_effects_to_mob(mob/living/carbon/sleepyhead)
|
||||
to_chat(sleepyhead, span_boldnotice("You begin to wake from cryosleep..."))
|
||||
sleepyhead.set_nutrition(200)
|
||||
sleepyhead.SetSleeping(60) //if you read this comment and feel like shitting together something to adjust IPC charge on wakeup, be my guest.
|
||||
//but it can be worse.
|
||||
if(prob(90))
|
||||
sleepyhead.adjust_drowsiness(rand(3 SECONDS, 10 SECONDS))
|
||||
if(prob(75))
|
||||
sleepyhead.blur_eyes(rand(3, 6))
|
||||
//so much worse
|
||||
if(prob(66))
|
||||
sleepyhead.adjust_disgust(rand(25,35))
|
||||
if(prob(33))
|
||||
sleepyhead.adjust_disgust(rand(20,30))
|
||||
if(prob(16))
|
||||
sleepyhead.adjust_disgust(rand(10, 17))
|
||||
to_chat(sleepyhead, "<span class='userdanger'>The symptoms of cryosleep set in as you awaken...")
|
||||
|
||||
@@ -84,7 +84,7 @@
|
||||
addtimer(CALLBACK(src, PROC_REF(set_ready_state), 1), equip_cooldown)
|
||||
|
||||
/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser
|
||||
equip_cooldown = 5
|
||||
equip_cooldown = 8
|
||||
name = "\improper CH-PS \"Immolator\" laser"
|
||||
desc = "A weapon for combat exosuits. Shoots basic lasers."
|
||||
icon_state = "mecha_laser"
|
||||
|
||||
@@ -77,8 +77,8 @@
|
||||
user.add_atom_colour(paint_color, ADMIN_COLOUR_PRIORITY)
|
||||
return (BRUTELOSS|OXYLOSS)
|
||||
|
||||
/obj/item/toy/crayon/proc/min_value(color = "#000000") // Makes the paint color brighter if it is below quarter bright (V < 64)
|
||||
var/list/read = ReadRGB(color) // Converts the RGB string into a list
|
||||
/obj/item/toy/crayon/proc/min_value() // Makes the paint color brighter if it is below quarter bright (V < 64)
|
||||
var/list/read = ReadRGB(paint_color) // Converts the RGB string into a list
|
||||
var/value = max(read) // Reads the V from HSV, essentially the brightness
|
||||
|
||||
if(value >= 64) // Min V is 64, 3 quarters to black from white
|
||||
@@ -94,7 +94,7 @@
|
||||
read[2] = 64
|
||||
read[3] = 64
|
||||
|
||||
return rgb(read[1], read[2], read[3])
|
||||
paint_color = rgb(read[1], read[2], read[3])
|
||||
|
||||
/obj/item/toy/crayon/Initialize(mapload)
|
||||
. = ..()
|
||||
@@ -254,6 +254,7 @@
|
||||
if("select_colour")
|
||||
if(can_change_colour)
|
||||
paint_color = input(usr,"","Choose Color",paint_color) as color|null
|
||||
min_value()
|
||||
. = TRUE
|
||||
if("enter_text")
|
||||
var/txt = stripped_input(usr,"Choose what to write.",
|
||||
@@ -392,7 +393,7 @@
|
||||
if(actually_paints)
|
||||
switch(paint_mode)
|
||||
if(PAINT_NORMAL)
|
||||
var/obj/effect/decal/cleanable/crayon/C = new(target, min_value(paint_color), drawing, temp, graf_rot)
|
||||
var/obj/effect/decal/cleanable/crayon/C = new(target, paint_color, drawing, temp, graf_rot)
|
||||
C.add_hiddenprint(user)
|
||||
C.pixel_x = clickx
|
||||
C.pixel_y = clicky
|
||||
@@ -401,7 +402,7 @@
|
||||
var/turf/left = locate(target.x-1,target.y,target.z)
|
||||
var/turf/right = locate(target.x+1,target.y,target.z)
|
||||
if(isValidSurface(left) && isValidSurface(right))
|
||||
var/obj/effect/decal/cleanable/crayon/C = new(left, min_value(paint_color), drawing, temp, graf_rot, PAINT_LARGE_HORIZONTAL_ICON)
|
||||
var/obj/effect/decal/cleanable/crayon/C = new(left, paint_color, drawing, temp, graf_rot, PAINT_LARGE_HORIZONTAL_ICON)
|
||||
C.add_hiddenprint(user)
|
||||
affected_turfs += left
|
||||
affected_turfs += right
|
||||
@@ -522,6 +523,7 @@
|
||||
|
||||
/obj/item/toy/crayon/rainbow/afterattack(atom/target, mob/user, proximity, params)
|
||||
paint_color = rgb(rand(0,255), rand(0,255), rand(0,255))
|
||||
min_value()
|
||||
. = ..()
|
||||
|
||||
/*
|
||||
@@ -680,7 +682,7 @@
|
||||
if(ishuman(C) && actually_paints)
|
||||
var/mob/living/carbon/human/H = C
|
||||
H.lip_style = "spray_face"
|
||||
H.lip_color = min_value(paint_color)
|
||||
H.lip_color = paint_color
|
||||
H.update_body()
|
||||
|
||||
. = use_charges(user, 10, FALSE)
|
||||
@@ -691,9 +693,9 @@
|
||||
|
||||
if(isobj(target))
|
||||
if(actually_paints)
|
||||
target.add_atom_colour(min_value(paint_color), WASHABLE_COLOUR_PRIORITY)
|
||||
target.add_atom_colour(paint_color, WASHABLE_COLOUR_PRIORITY)
|
||||
if(istype(target, /obj/structure/window))
|
||||
if(color_hex2num(min_value(paint_color)) < 255)
|
||||
if(color_hex2num(paint_color) < 255)
|
||||
target.set_opacity(255)
|
||||
else
|
||||
target.set_opacity(initial(target.opacity))
|
||||
|
||||
@@ -540,12 +540,9 @@ GLOBAL_LIST_EMPTY(servant_golem_users)
|
||||
shoes = /obj/item/clothing/shoes/combat
|
||||
gloves = /obj/item/clothing/gloves/combat
|
||||
ears = /obj/item/radio/headset/syndicate/alt
|
||||
back = /obj/item/storage/backpack
|
||||
implants = list(/obj/item/implant/weapons_auth)
|
||||
id = /obj/item/card/id/syndicate
|
||||
back = /obj/item/storage/backpack
|
||||
backpack_contents = list(
|
||||
/obj/item/storage/box/syndie
|
||||
)
|
||||
|
||||
/datum/outfit/syndicate_empty/post_equip(mob/living/carbon/human/H)
|
||||
H.faction |= ROLE_SYNDICATE
|
||||
@@ -562,10 +559,6 @@ GLOBAL_LIST_EMPTY(servant_golem_users)
|
||||
l_pocket = /obj/item/gun/ballistic/automatic/pistol
|
||||
r_pocket = /obj/item/kitchen/knife/combat/survival
|
||||
belt = /obj/item/storage/belt/military/assault
|
||||
back = /obj/item/storage/backpack
|
||||
backpack_contents = list(
|
||||
/obj/item/storage/box/syndie
|
||||
)
|
||||
|
||||
/obj/effect/mob_spawn/human/syndicate/battlecruiser/assault
|
||||
name = "Syndicate Battlecruiser Assault Operative"
|
||||
@@ -584,9 +577,6 @@ GLOBAL_LIST_EMPTY(servant_golem_users)
|
||||
suit_store = /obj/item/gun/ballistic/automatic/pistol
|
||||
back = /obj/item/storage/backpack/security
|
||||
mask = /obj/item/clothing/mask/gas/syndicate
|
||||
backpack_contents = list(
|
||||
/obj/item/storage/box/syndie
|
||||
)
|
||||
|
||||
/obj/effect/mob_spawn/human/syndicate/battlecruiser/captain
|
||||
name = "Syndicate Battlecruiser Captain"
|
||||
@@ -606,9 +596,6 @@ GLOBAL_LIST_EMPTY(servant_golem_users)
|
||||
head = /obj/item/clothing/head/HoS/syndicate
|
||||
mask = /obj/item/clothing/mask/cigarette/cigar/havana
|
||||
glasses = /obj/item/clothing/glasses/thermal/eyepatch
|
||||
backpack_contents = list(
|
||||
/obj/item/storage/box/syndie
|
||||
)
|
||||
|
||||
//Icemoon Syndicate. Players become research agents working under a Syndicate research station.
|
||||
/obj/effect/mob_spawn/human/syndicate/icemoon_syndicate //generic version
|
||||
@@ -627,10 +614,6 @@ GLOBAL_LIST_EMPTY(servant_golem_users)
|
||||
r_pocket = /obj/item/tank/internals/emergency_oxygen/double
|
||||
mask = /obj/item/clothing/mask/gas/syndicate
|
||||
id = /obj/item/card/id/syndicate/anyone
|
||||
back = /obj/item/storage/backpack
|
||||
backpack_contents = list(
|
||||
/obj/item/storage/box/syndie
|
||||
)
|
||||
|
||||
/obj/effect/mob_spawn/human/syndicate/icemoon_syndicate/security
|
||||
name = "Syndicate Outpost Security Officer"
|
||||
@@ -646,10 +629,6 @@ GLOBAL_LIST_EMPTY(servant_golem_users)
|
||||
mask = /obj/item/clothing/mask/gas //i want them to look like the generic operative NPC
|
||||
belt = /obj/item/storage/belt/security/full //take like one guy alive
|
||||
glasses = /obj/item/clothing/glasses/hud/security/sunglasses //identify the job of whoever the fuck is breaking in at a glance
|
||||
back = /obj/item/storage/backpack
|
||||
backpack_contents = list(
|
||||
/obj/item/storage/box/syndie
|
||||
)
|
||||
|
||||
/obj/effect/mob_spawn/human/syndicate/icemoon_syndicate/sci
|
||||
name = "Syndicate Outpost Researcher"
|
||||
@@ -664,10 +643,6 @@ GLOBAL_LIST_EMPTY(servant_golem_users)
|
||||
suit = /obj/item/clothing/suit/toggle/labcoat/science
|
||||
accessory = /obj/item/clothing/accessory/armband/science
|
||||
glasses = /obj/item/clothing/glasses/hud/diagnostic/sunglasses/rd //it's a syndicate nerd
|
||||
back = /obj/item/storage/backpack
|
||||
backpack_contents = list(
|
||||
/obj/item/storage/box/syndie
|
||||
)
|
||||
|
||||
/obj/effect/mob_spawn/human/syndicate/icemoon_syndicate/engineer
|
||||
name = "Syndicate Outpost Engineer"
|
||||
@@ -683,10 +658,6 @@ GLOBAL_LIST_EMPTY(servant_golem_users)
|
||||
head = /obj/item/clothing/head/hardhat
|
||||
accessory = /obj/item/clothing/accessory/armband/engine
|
||||
glasses = /obj/item/clothing/glasses/meson/sunglasses/ce
|
||||
back = /obj/item/storage/backpack
|
||||
backpack_contents = list(
|
||||
/obj/item/storage/box/syndie
|
||||
)
|
||||
|
||||
/obj/effect/mob_spawn/human/syndicate/icemoon_syndicate/medic
|
||||
name = "Syndicate Outpost Doctor"
|
||||
@@ -701,10 +672,6 @@ GLOBAL_LIST_EMPTY(servant_golem_users)
|
||||
suit = /obj/item/clothing/suit/toggle/labcoat/md //I AM A SURGEON!!
|
||||
glasses = /obj/item/clothing/glasses/hud/health/sunglasses/cmo //rapid hurt and chemical identification
|
||||
accessory = /obj/item/clothing/accessory/armband/medblue
|
||||
back = /obj/item/storage/backpack
|
||||
backpack_contents = list(
|
||||
/obj/item/storage/box/syndie
|
||||
)
|
||||
|
||||
/obj/effect/mob_spawn/human/syndicate/icemoon_syndicate/commander
|
||||
name = "Syndicate Outpost Commander"
|
||||
@@ -726,12 +693,7 @@ GLOBAL_LIST_EMPTY(servant_golem_users)
|
||||
back = /obj/item/storage/backpack/satchel/leather //LUXURY AT ITS FINEST
|
||||
suit_store = /obj/item/gun/ballistic/revolver
|
||||
belt = /obj/item/storage/belt/sabre //ceremonial shamnk
|
||||
backpack_contents = list(
|
||||
/obj/item/storage/box/syndie,
|
||||
/obj/item/modular_computer/tablet/preset/syndicate=1,
|
||||
/obj/item/ammo_box/a357=2,
|
||||
/obj/item/melee/classic_baton/telescopic=1
|
||||
)
|
||||
backpack_contents = list(/obj/item/modular_computer/tablet/preset/syndicate=1, /obj/item/ammo_box/a357=2, /obj/item/melee/classic_baton/telescopic=1)
|
||||
|
||||
//Icemoon Hermit. Player becomes a individual who sook out shelter from society by running away.
|
||||
|
||||
@@ -936,9 +898,6 @@ GLOBAL_LIST_EMPTY(servant_golem_users)
|
||||
l_pocket = /obj/item/flashlight
|
||||
r_pocket = /obj/item/kitchen/knife/combat/survival
|
||||
implants = list(/obj/item/implant/weapons_auth)
|
||||
backpack_contents = list(
|
||||
/obj/item/storage/box/syndie
|
||||
)
|
||||
|
||||
/datum/outfit/syndicate_derelict_engi/post_equip(mob/living/carbon/human/H)
|
||||
H.faction |= ROLE_SYNDICATE
|
||||
|
||||
@@ -1,48 +0,0 @@
|
||||
#define STEAM_BUILDUP_RATE 0.75
|
||||
#define STEAM_RELEASE_RATE 0.5
|
||||
|
||||
/obj/structure/steam_fissure
|
||||
name = "geothermal fissure"
|
||||
desc = "A crack in the ground where hot steam rises to the surface."
|
||||
icon = 'icons/obj/lavaland/terrain.dmi'
|
||||
icon_state = "geyser"
|
||||
anchored = TRUE
|
||||
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF // you can't destroy a hole in the ground
|
||||
|
||||
///Gas ID spawned
|
||||
var/gas_id = GAS_H2O
|
||||
///Temperature of the released gas
|
||||
var/steam_production_temp = T0C+800
|
||||
///Maximum pressure it can get to
|
||||
var/pressure_limit = ONE_ATMOSPHERE*100
|
||||
///Internal gas mixture
|
||||
var/datum/gas_mixture/contained
|
||||
|
||||
/obj/structure/steam_fissure/Initialize(mapload)
|
||||
. = ..()
|
||||
contained = new()
|
||||
START_PROCESSING(SSobj, src)
|
||||
|
||||
/obj/structure/steam_fissure/Destroy()
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
return ..()
|
||||
|
||||
/obj/structure/steam_fissure/process(delta_time)
|
||||
var/pressure_delta = pressure_limit - contained.return_pressure()
|
||||
if(pressure_delta > 0)
|
||||
var/production = (pressure_delta * STEAM_BUILDUP_RATE) * contained.return_volume() / (R_IDEAL_GAS_EQUATION * steam_production_temp)
|
||||
var/heat_delta = (steam_production_temp - contained.return_temperature()) * (GLOB.gas_data.specific_heats[gas_id]*production) / ((GLOB.gas_data.specific_heats[gas_id]*production) + contained.heat_capacity())
|
||||
contained.adjust_moles(gas_id, production)
|
||||
contained.set_temperature(contained.return_temperature() + heat_delta)
|
||||
|
||||
if(!isopenturf(loc))
|
||||
return
|
||||
|
||||
var/turf/open/T = loc
|
||||
pressure_delta = contained.return_pressure() - T.air.return_pressure()
|
||||
if(pressure_delta > 0)
|
||||
T.assume_air(contained.remove_ratio(STEAM_RELEASE_RATE))
|
||||
T.air_update_turf()
|
||||
|
||||
#undef STEAM_BUILDUP_RATE
|
||||
#undef STEAM_RELEASE_RATE
|
||||
@@ -1169,7 +1169,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
|
||||
if(iscarbon(target))
|
||||
var/mob/living/carbon/CM = target
|
||||
for(var/obj/item/bodypart/bodypart in CM.bodyparts)
|
||||
if(!(bodypart.body_part & (HEAD|CHEST)))
|
||||
if(bodypart.body_part != HEAD && bodypart.body_part != CHEST)
|
||||
if(bodypart.dismemberable)
|
||||
bodypart.dismember()
|
||||
if(ADMIN_PUNISHMENT_GIB)
|
||||
|
||||
@@ -143,7 +143,7 @@
|
||||
if(ishuman(target))
|
||||
var/mob/living/carbon/human/H = target
|
||||
for(var/obj/item/bodypart/bodypart in H.bodyparts)
|
||||
if(bodypart.body_part & (HEAD|CHEST))
|
||||
if(bodypart.body_part != HEAD && bodypart.body_part != CHEST)
|
||||
if(bodypart.dismemberable)
|
||||
bodypart.dismember()
|
||||
qdel(bodypart)
|
||||
@@ -154,7 +154,7 @@
|
||||
if(iscarbon(target))
|
||||
var/mob/living/carbon/C = target
|
||||
for(var/obj/item/bodypart/bodypart in C.bodyparts)
|
||||
if(!(bodypart.body_part & (HEAD|CHEST)))
|
||||
if(bodypart.body_part != HEAD && bodypart.body_part != CHEST)
|
||||
if(bodypart.dismemberable)
|
||||
bodypart.dismember()
|
||||
qdel(bodypart)
|
||||
|
||||
@@ -227,7 +227,7 @@
|
||||
var/mob/living/carbon/carbon_target_mob = target_living
|
||||
for (var/bp in carbon_target_mob.bodyparts) //Look at the bodyparts in our poor mob beneath our pod as it lands
|
||||
var/obj/item/bodypart/bodypart = bp
|
||||
if(!(bodypart.body_part & (HEAD|CHEST)))//we dont want to kill him, just teach em a lesson!
|
||||
if(bodypart.body_part != HEAD && bodypart.body_part != CHEST)//we dont want to kill him, just teach em a lesson!
|
||||
if (bodypart.dismemberable)
|
||||
bodypart.dismember() //Using the power of flextape i've sawed this man's limb in half!
|
||||
break
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
/datum/bank_account
|
||||
var/account_holder = "Rusty Venture"
|
||||
var/account_balance = 0
|
||||
var/payday_modifier
|
||||
var/datum/job/account_job
|
||||
var/list/bank_cards = list()
|
||||
var/add_to_accounts = TRUE
|
||||
@@ -13,7 +14,7 @@
|
||||
var/bounties_claimed = 0 // Marks how many bounties this person has successfully claimed
|
||||
var/sec_weapon_claimed = FALSE // If this account has claimed a weapon \code\modules\vending\security_armaments.dm
|
||||
|
||||
/datum/bank_account/New(newname, job)
|
||||
/datum/bank_account/New(newname, job, modifier = 1)
|
||||
var/limiter = 0
|
||||
while(limiter < 10)
|
||||
account_id = rand(111111,999999)
|
||||
@@ -28,6 +29,7 @@
|
||||
SSeconomy.bank_accounts["[account_id]"] = src
|
||||
account_holder = newname
|
||||
account_job = job
|
||||
payday_modifier = modifier
|
||||
|
||||
/datum/bank_account/Destroy()
|
||||
if(add_to_accounts)
|
||||
@@ -66,7 +68,9 @@
|
||||
return FALSE
|
||||
|
||||
/datum/bank_account/proc/payday(amt_of_paychecks, free = FALSE)
|
||||
var/money_to_transfer = account_job.paycheck * amt_of_paychecks
|
||||
var/money_to_transfer = account_job.paycheck * payday_modifier * amt_of_paychecks
|
||||
var/stolen_money = (1 - payday_modifier) * account_job.paycheck * amt_of_paychecks
|
||||
GLOB.stolen_paycheck_money += stolen_money
|
||||
if(free)
|
||||
adjust_money(money_to_transfer)
|
||||
return TRUE
|
||||
|
||||
@@ -189,7 +189,7 @@
|
||||
H.apply_pref_name(/datum/preference/name/backup_human, preference_source)
|
||||
|
||||
if(!visualsOnly)
|
||||
var/datum/bank_account/bank_account = new(H.real_name, src)
|
||||
var/datum/bank_account/bank_account = new(H.real_name, src, H.dna.species.payday_modifier)
|
||||
bank_account.adjust_money(rand(STARTING_PAYCHECKS_MIN, STARTING_PAYCHECKS_MAX), TRUE)
|
||||
bank_account.payday(STARTING_PAYCHECKS, TRUE)
|
||||
H.account_id = bank_account.account_id
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
outfit = /datum/outfit/job/roboticist
|
||||
|
||||
added_access = list(ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_XENOBIOLOGY, ACCESS_GENETICS, ACCESS_RND)
|
||||
base_access = list(ACCESS_ROBOTICS, ACCESS_ROBO_CONTROL, ACCESS_TECH_STORAGE, ACCESS_MORGUE, ACCESS_RESEARCH, ACCESS_MECH_SCIENCE, ACCESS_MECH_ENGINE, ACCESS_MECH_MEDICAL, ACCESS_MECH_MINING, ACCESS_MINERAL_STOREROOM)
|
||||
base_access = list(ACCESS_ROBO_CONTROL, ACCESS_TECH_STORAGE, ACCESS_MORGUE, ACCESS_RESEARCH, ACCESS_MECH_SCIENCE, ACCESS_MECH_ENGINE, ACCESS_MECH_MEDICAL, ACCESS_MECH_MINING, ACCESS_MINERAL_STOREROOM)
|
||||
paycheck = PAYCHECK_MEDIUM
|
||||
paycheck_department = ACCOUNT_SCI
|
||||
|
||||
|
||||
@@ -99,6 +99,8 @@ GLOBAL_LIST_EMPTY(features_by_species)
|
||||
var/pressuremod = 1
|
||||
/// multiplier for EMP severity
|
||||
var/emp_mod = 1
|
||||
/// multiplier for money paid at payday, species dependent
|
||||
var/payday_modifier = 1
|
||||
///Type of damage attack does
|
||||
var/attack_type = BRUTE
|
||||
///lowest possible punch damage. if this is set to 0, punches will always miss
|
||||
|
||||
@@ -24,6 +24,7 @@
|
||||
exotic_blood = /datum/reagent/oil
|
||||
damage_overlay_type = "synth"
|
||||
limbs_id = "synth"
|
||||
payday_modifier = 0.3 //Mass producible labor + robot, lucky to be paid at all
|
||||
pressuremod = 0.5 // from the moment i understood the weakness of my flesh it disgusted me
|
||||
heatmod = 0.5 // and i yearned for the certainty of steel
|
||||
burnmod = 1.25 // easily cut by laser cutters and welding tools to speed up manufacturing
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
speedmod = -0.1 //Light and energy move quickly
|
||||
punchdamagehigh = 11 //Fire hand more painful
|
||||
punchstunthreshold = 11 //Still stuns on max hit, but subsequently lower chance to stun overall
|
||||
payday_modifier = 0.7 //Moths have to be compensated slightly more to be willing to work for NT bcuz drug therapy, both ethereal and moth are neutral though
|
||||
attack_type = BURN //burn bish
|
||||
damage_overlay_type = "" //We are too cool for regular damage overlays
|
||||
species_traits = list(NOEYESPRITES, EYECOLOR, MUTCOLORS, AGENDER, HAIR, FACEHAIR, HAS_FLESH) // i mean i guess they have blood so they can have wounds too
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
coldmod = 6
|
||||
heatmod = 0.5
|
||||
burnmod = 0.5 // = 1/2x generic burn damage
|
||||
payday_modifier = 0.6 //literally a pile of toxic ooze walking around, definitely a health hazard
|
||||
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT
|
||||
species_language_holder = /datum/language_holder/jelly
|
||||
swimming_component = /datum/component/swimming/dissolve
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
mutanttail = /obj/item/organ/tail/lizard
|
||||
coldmod = 0.67 //used to being cold, just doesn't like it much
|
||||
heatmod = 0.67 //greatly appreciate heat, just not too much
|
||||
payday_modifier = 0.85 //Full SIC citizens, but not quite given all the same rights- it's been an ongoing process for about half a decade
|
||||
default_features = list("mcolor" = "#00FF00", "tail_lizard" = "Smooth", "snout" = "Round", "horns" = "None", "frills" = "None", "spines" = "None", "body_markings" = "None", "legs" = "Normal Legs")
|
||||
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT
|
||||
attack_verb = "slash"
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
say_mod = "flutters"
|
||||
default_color = "00FF00"
|
||||
species_traits = list(LIPS, NOEYESPRITES,HAS_FLESH,HAS_BONE)
|
||||
payday_modifier = 0.8 //Neutral, but non-human; pay less if you can get away with it
|
||||
inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_BUG
|
||||
mutant_bodyparts = list("moth_wings")
|
||||
default_features = list("moth_wings" = "Plain")
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
heatmod = 1.5 //Don't let the plasma actually heat up though
|
||||
punchdamagehigh = 7 //Bone punches are weak and usually inside soft suit gloves
|
||||
punchstunthreshold = 7 //Stuns on max hit as usual, somewhat higher stun chance because math
|
||||
payday_modifier = 1 //Former humans, employment restrictions arise from psychological and practical concerns; they won't be able to be some head positions, but they get human pay and NT can't weasel out of it
|
||||
breathid = "tox"
|
||||
damage_overlay_type = ""//let's not show bloody wounds or burns over bones.
|
||||
disliked_food = NONE
|
||||
|
||||
@@ -21,6 +21,7 @@
|
||||
inert_mutation = ACIDSPIT
|
||||
punchdamagehigh = 11 //slightly better high end of damage
|
||||
punchstunthreshold = 11 //technically slightly worse stunchance
|
||||
payday_modifier = 0.3 //Some are quite literally slaves + they HAVE to work for NT
|
||||
damage_overlay_type = "polysmorph"
|
||||
deathsound = 'sound/voice/hiss6.ogg'
|
||||
screamsound = 'sound/voice/hiss5.ogg'
|
||||
|
||||
@@ -410,7 +410,7 @@ mob/living/simple_animal/hostile/construct/attackby(obj/item/W, mob/living/user,
|
||||
var/undismembermerable_limbs = 0
|
||||
for(var/X in C.bodyparts)
|
||||
var/obj/item/bodypart/BP = X
|
||||
if(!(BP.body_part & (HEAD|CHEST)))
|
||||
if(BP.body_part != HEAD && BP.body_part != CHEST)
|
||||
if(BP.dismemberable)
|
||||
parts += BP
|
||||
else
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
if(C.stat >= UNCONSCIOUS)
|
||||
for(var/X in C.bodyparts)
|
||||
var/obj/item/bodypart/BP = X
|
||||
if(!(BP.body_part & (HEAD|CHEST)))
|
||||
if(BP.body_part != HEAD && BP.body_part != CHEST)
|
||||
if(BP.dismemberable)
|
||||
parts += BP
|
||||
return parts
|
||||
|
||||
@@ -110,11 +110,6 @@
|
||||
if(turbine)
|
||||
turbine.locate_machinery()
|
||||
|
||||
/obj/machinery/power/compressor/multitool_act(mob/living/user, obj/item/multitool/tool)
|
||||
tool.buffer = src
|
||||
user.balloon_alert(user, "saved to buffer")
|
||||
return TRUE
|
||||
|
||||
/obj/machinery/power/compressor/RefreshParts()
|
||||
var/E = 0
|
||||
for(var/obj/item/stock_parts/manipulator/M in component_parts)
|
||||
@@ -220,14 +215,6 @@
|
||||
if(compressor)
|
||||
compressor.locate_machinery()
|
||||
|
||||
/obj/machinery/power/turbine/multitool_act(mob/living/user, obj/item/multitool/tool)
|
||||
if(!compressor)
|
||||
user.balloon_alert(user, "no compressor!")
|
||||
return TRUE
|
||||
tool.buffer = compressor
|
||||
user.balloon_alert(user, "saved to buffer")
|
||||
return TRUE
|
||||
|
||||
/obj/machinery/power/turbine/process(delta_time)
|
||||
add_avail(lastgen) // add power in process() so it doesn't update power output separately from the rest of the powernet (bad)
|
||||
|
||||
@@ -358,15 +345,6 @@
|
||||
else
|
||||
compressor = locate(/obj/machinery/power/compressor) in range(7, src)
|
||||
|
||||
/obj/machinery/computer/turbine_computer/multitool_act(mob/living/user, obj/item/multitool/tool)
|
||||
if(istype(tool.buffer, /obj/machinery/power/compressor))
|
||||
var/obj/machinery/power/compressor/new_link = tool.buffer
|
||||
if(!new_link.comp_id)
|
||||
new_link.comp_id = getnewid()
|
||||
id = new_link.comp_id
|
||||
user.balloon_alert(user, "linked!")
|
||||
return TRUE
|
||||
|
||||
/obj/machinery/computer/turbine_computer/ui_interact(mob/user, datum/tgui/ui)
|
||||
ui = SStgui.try_update_ui(user, src, ui)
|
||||
if(!ui)
|
||||
|
||||
@@ -133,9 +133,6 @@
|
||||
r_pocket = /obj/item/gun/ballistic/automatic/pistol
|
||||
id = /obj/item/card/id/syndicate/anyone
|
||||
implants = list(/obj/item/implant/weapons_auth)
|
||||
backpack_contents = list(
|
||||
/obj/item/storage/box/syndie
|
||||
)
|
||||
|
||||
/datum/outfit/lavaland_syndicate/post_equip(mob/living/carbon/human/H)
|
||||
H.faction |= ROLE_SYNDICATE
|
||||
@@ -166,30 +163,20 @@
|
||||
r_hand = /obj/item/melee/transforming/energy/sword/saber
|
||||
mask = /obj/item/clothing/mask/chameleon/gps
|
||||
suit = /obj/item/clothing/suit/armor/vest
|
||||
back = /obj/item/storage/backpack
|
||||
backpack_contents = list(
|
||||
/obj/item/storage/box/syndie,
|
||||
/obj/item/modular_computer/tablet/preset/syndicate=1
|
||||
)
|
||||
backpack_contents = list(/obj/item/modular_computer/tablet/preset/syndicate=1)
|
||||
|
||||
/datum/outfit/lavaland_syndicate/comms/subordinate
|
||||
name = "Space Syndicate Comms Agent"
|
||||
r_hand = /obj/item/kitchen/knife/combat
|
||||
back = /obj/item/storage/backpack
|
||||
backpack_contents = list(
|
||||
/obj/item/storage/box/syndie
|
||||
)
|
||||
|
||||
/datum/outfit/lavaland_syndicate/comms/lieutenant
|
||||
name = "Space Syndicate Comms Agent Lieutenant"
|
||||
r_hand = /obj/item/melee/transforming/energy/sword/saber
|
||||
head = /obj/item/clothing/head/HoS/syndicate
|
||||
r_pocket = null
|
||||
back = /obj/item/storage/backpack
|
||||
backpack_contents = list(
|
||||
/obj/item/storage/box/syndie,
|
||||
/obj/item/modular_computer/tablet/preset/syndicate=1,
|
||||
/obj/item/gun/ballistic/revolver/ultrasecure=1
|
||||
/obj/item/gun/ballistic/revolver/ultrasecure=1,
|
||||
)
|
||||
|
||||
/obj/item/clothing/mask/chameleon/gps/Initialize(mapload)
|
||||
|
||||
@@ -674,9 +674,6 @@ ROUNDSTART_TRAITS
|
||||
## Uncomment to disable human moods.
|
||||
DISABLE_HUMAN_MOOD
|
||||
|
||||
## Uncomment to force human moods. Not compatible with DISABLE_HUMAN_MOOD
|
||||
FORCE_HUMAN_MOOD
|
||||
|
||||
## Enable night shifts ##
|
||||
#ENABLE_NIGHT_SHIFTS
|
||||
|
||||
|
||||
@@ -57,104 +57,6 @@
|
||||
-->
|
||||
<div class="commit sansserif">
|
||||
|
||||
<h2 class="date">19 December 2023</h2>
|
||||
<h3 class="author"> Scrambledeggs00 & Molti updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="imageadd">new vampire cloak</li>
|
||||
<li class="imagedel">old vampire cloak</li>
|
||||
</ul>
|
||||
<h3 class="author"> cark updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="mapping">fixes mislabeled cameras in chapel on box</li>
|
||||
</ul>
|
||||
<h3 class="author"> cark, cowbot93 updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="mapping">improves new bar by fixing issues and adding coffee</li>
|
||||
</ul>
|
||||
<h3 class="author">SapphicOverload updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="rscadd">icemeta's useless solar arrays have been replaced with geothermal power stations</li>
|
||||
</ul>
|
||||
|
||||
<h2 class="date">18 December 2023</h2>
|
||||
<h3 class="author">cowbot92 updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="mapping">Adjusts the singulo/tesla engine template</li>
|
||||
</ul>
|
||||
|
||||
<h2 class="date">17 December 2023</h2>
|
||||
<h3 class="author">SapphicOverload updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="bugfix">fixed a bunch of things being able to behead when they shouldn't</li>
|
||||
<li class="bugfix">fixed roboticists not having robotics access</li>
|
||||
</ul>
|
||||
|
||||
<h2 class="date">15 December 2023</h2>
|
||||
<h3 class="author">Mqiib updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="bugfix">You can now use darker colors on canvases.</li>
|
||||
</ul>
|
||||
<h3 class="author">ToasterBiome updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="rscdel">Removes species pay modifiers</li>
|
||||
</ul>
|
||||
|
||||
<h2 class="date">14 December 2023</h2>
|
||||
<h3 class="author"> Mqiib, @RG4ORDR @SapphicOverload updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="tweak">Sidewinder mechs made moderately tougher</li>
|
||||
<li class="tweak">Sidewinder mechs slightly better in melee than before</li>
|
||||
<li class="rscadd">Sidewinder mechs have superior projectile deflection, watch those lasers!</li>
|
||||
<li class="bugfix">Directional damage modifiers and deflection modifiers work for melee too now</li>
|
||||
<li class="tweak">Demolition modifiers are half-effective versus non-combat mechs and completely ineffective vs combat mechs</li>
|
||||
</ul>
|
||||
<h3 class="author"> cark updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="mapping">fixed some issues on donut</li>
|
||||
<li class="rscadd">certain items now give chems they did not before</li>
|
||||
</ul>
|
||||
<h3 class="author"> cark, azzzertyy updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="mapping">Redesigns Box's bar/kitchen, nukes all the old templates and moves theatre north to fitness.</li>
|
||||
</ul>
|
||||
<h3 class="author">AMyriad updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="rscadd">Added Biosignaller implants to nuke ops and ERTs, which alert their teammates when and where they died</li>
|
||||
<li class="tweak">Syndicate ghost roles now have a survival box</li>
|
||||
</ul>
|
||||
<h3 class="author">Moltijoe updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="tweak">Reworks superficial healing</li>
|
||||
</ul>
|
||||
<h3 class="author">Mqiib updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="bugfix">Actually buffs the immolator this time</li>
|
||||
<li class="tweak">Base mech vs mech damage multiplier for melee weapons and punches reduced</li>
|
||||
<li class="tweak">Energy axe and rapier mech multipliers tweaked</li>
|
||||
<li class="tweak">Mech katana damage bonus and AP increased</li>
|
||||
</ul>
|
||||
<h3 class="author">SapphicOverload updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="bugfix">fixed snowstorms bypassing cold protection</li>
|
||||
<li class="tweak">adds electrical and heat protection to engineering envirosuit helmets</li>
|
||||
</ul>
|
||||
<h3 class="author">ToasterBiome updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="mapping">Changes NVS Gax Robotics to be more open</li>
|
||||
<li class="rscadd">Mood is globally enabled for everyone</li>
|
||||
<li class="rscadd">Map rotations and player votes no longer offer maps if they were played the last 70% of rounds</li>
|
||||
<li class="rscadd">Adds a new Christmas song to the lobby music for Christmas!</li>
|
||||
</ul>
|
||||
<h3 class="author">bruhlookatthisdood updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="bugfix">you can now hit the captain's gun case</li>
|
||||
</ul>
|
||||
<h3 class="author">cowbot92 updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="rscadd">Adds coffee machine to the new bar</li>
|
||||
<li class="mapping">Maps it duh</li>
|
||||
</ul>
|
||||
|
||||
<h2 class="date">13 December 2023</h2>
|
||||
<h3 class="author">AMyriad updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
|
||||
@@ -42608,66 +42608,3 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
|
||||
- tweak: Regenerative cores cannot be put into autosurgeons.
|
||||
bruhlookatthisdood:
|
||||
- tweak: Moved items in captain's office to make them more accessible
|
||||
2023-12-14:
|
||||
' Mqiib, @RG4ORDR @SapphicOverload':
|
||||
- tweak: Sidewinder mechs made moderately tougher
|
||||
- tweak: Sidewinder mechs slightly better in melee than before
|
||||
- rscadd: Sidewinder mechs have superior projectile deflection, watch those lasers!
|
||||
- bugfix: Directional damage modifiers and deflection modifiers work for melee too
|
||||
now
|
||||
- tweak: Demolition modifiers are half-effective versus non-combat mechs and completely
|
||||
ineffective vs combat mechs
|
||||
' cark':
|
||||
- mapping: fixed some issues on donut
|
||||
- rscadd: certain items now give chems they did not before
|
||||
' cark, azzzertyy':
|
||||
- mapping: Redesigns Box's bar/kitchen, nukes all the old templates and moves theatre
|
||||
north to fitness.
|
||||
AMyriad:
|
||||
- rscadd: Added Biosignaller implants to nuke ops and ERTs, which alert their teammates
|
||||
when and where they died
|
||||
- tweak: Syndicate ghost roles now have a survival box
|
||||
Moltijoe:
|
||||
- tweak: Reworks superficial healing
|
||||
Mqiib:
|
||||
- bugfix: Actually buffs the immolator this time
|
||||
- tweak: Base mech vs mech damage multiplier for melee weapons and punches reduced
|
||||
- tweak: Energy axe and rapier mech multipliers tweaked
|
||||
- tweak: Mech katana damage bonus and AP increased
|
||||
SapphicOverload:
|
||||
- bugfix: fixed snowstorms bypassing cold protection
|
||||
- tweak: adds electrical and heat protection to engineering envirosuit helmets
|
||||
ToasterBiome:
|
||||
- mapping: Changes NVS Gax Robotics to be more open
|
||||
- rscadd: Mood is globally enabled for everyone
|
||||
- rscadd: Map rotations and player votes no longer offer maps if they were played
|
||||
the last 70% of rounds
|
||||
- rscadd: Adds a new Christmas song to the lobby music for Christmas!
|
||||
bruhlookatthisdood:
|
||||
- bugfix: you can now hit the captain's gun case
|
||||
cowbot92:
|
||||
- rscadd: Adds coffee machine to the new bar
|
||||
- mapping: Maps it duh
|
||||
2023-12-15:
|
||||
Mqiib:
|
||||
- bugfix: You can now use darker colors on canvases.
|
||||
ToasterBiome:
|
||||
- rscdel: Removes species pay modifiers
|
||||
2023-12-17:
|
||||
SapphicOverload:
|
||||
- bugfix: fixed a bunch of things being able to behead when they shouldn't
|
||||
- bugfix: fixed roboticists not having robotics access
|
||||
2023-12-18:
|
||||
cowbot92:
|
||||
- mapping: Adjusts the singulo/tesla engine template
|
||||
2023-12-19:
|
||||
' Scrambledeggs00 & Molti':
|
||||
- imageadd: new vampire cloak
|
||||
- imagedel: old vampire cloak
|
||||
' cark':
|
||||
- mapping: fixes mislabeled cameras in chapel on box
|
||||
' cark, cowbot93':
|
||||
- mapping: improves new bar by fixing issues and adding coffee
|
||||
SapphicOverload:
|
||||
- rscadd: icemeta's useless solar arrays have been replaced with geothermal power
|
||||
stations
|
||||
|
||||
4
html/changelogs/AutoChangelog-pr-20971.yml
Normal file
4
html/changelogs/AutoChangelog-pr-20971.yml
Normal file
@@ -0,0 +1,4 @@
|
||||
author: " cark, azzzertyy"
|
||||
delete-after: true
|
||||
changes:
|
||||
- mapping: "Redesigns Box's bar/kitchen, nukes all the old templates and moves theatre north to fitness."
|
||||
4
html/changelogs/AutoChangelog-pr-21007.yml
Normal file
4
html/changelogs/AutoChangelog-pr-21007.yml
Normal file
@@ -0,0 +1,4 @@
|
||||
author: "ToasterBiome"
|
||||
delete-after: true
|
||||
changes:
|
||||
- mapping: "Changes NVS Gax Robotics to be more open"
|
||||
4
html/changelogs/AutoChangelog-pr-21032.yml
Normal file
4
html/changelogs/AutoChangelog-pr-21032.yml
Normal file
@@ -0,0 +1,4 @@
|
||||
author: "Moltijoe"
|
||||
delete-after: true
|
||||
changes:
|
||||
- tweak: "Reworks superficial healing"
|
||||
4
html/changelogs/AutoChangelog-pr-21066.yml
Normal file
4
html/changelogs/AutoChangelog-pr-21066.yml
Normal file
@@ -0,0 +1,4 @@
|
||||
author: "AMyriad"
|
||||
delete-after: true
|
||||
changes:
|
||||
- rscadd: "Added Biosignaller implants to nuke ops and ERTs, which alert their teammates when and where they died"
|
||||
4
html/changelogs/AutoChangelog-pr-21072.yml
Normal file
4
html/changelogs/AutoChangelog-pr-21072.yml
Normal file
@@ -0,0 +1,4 @@
|
||||
author: "SapphicOverload"
|
||||
delete-after: true
|
||||
changes:
|
||||
- tweak: "adds electrical and heat protection to engineering envirosuit helmets"
|
||||
4
html/changelogs/AutoChangelog-pr-21078.yml
Normal file
4
html/changelogs/AutoChangelog-pr-21078.yml
Normal file
@@ -0,0 +1,4 @@
|
||||
author: "ToasterBiome"
|
||||
delete-after: true
|
||||
changes:
|
||||
- rscadd: "Adds a new Christmas song to the lobby music for Christmas!"
|
||||
4
html/changelogs/AutoChangelog-pr-21082.yml
Normal file
4
html/changelogs/AutoChangelog-pr-21082.yml
Normal file
@@ -0,0 +1,4 @@
|
||||
author: " cark"
|
||||
delete-after: true
|
||||
changes:
|
||||
- rscadd: "certain items now give chems they did not before"
|
||||
8
html/changelogs/AutoChangelog-pr-21089.yml
Normal file
8
html/changelogs/AutoChangelog-pr-21089.yml
Normal file
@@ -0,0 +1,8 @@
|
||||
author: " Mqiib, @RG4ORDR @SapphicOverload"
|
||||
delete-after: true
|
||||
changes:
|
||||
- tweak: "Sidewinder mechs made moderately tougher"
|
||||
- tweak: "Sidewinder mechs slightly better in melee than before"
|
||||
- rscadd: "Sidewinder mechs have superior projectile deflection, watch those lasers!"
|
||||
- bugfix: "Directional damage modifiers and deflection modifiers work for melee too now"
|
||||
- tweak: "Demolition modifiers are half-effective versus non-combat mechs and completely ineffective vs combat mechs"
|
||||
6
html/changelogs/AutoChangelog-pr-21095.yml
Normal file
6
html/changelogs/AutoChangelog-pr-21095.yml
Normal file
@@ -0,0 +1,6 @@
|
||||
author: "Mqiib"
|
||||
delete-after: true
|
||||
changes:
|
||||
- tweak: "Base mech vs mech damage multiplier for melee weapons and punches reduced"
|
||||
- tweak: "Energy axe and rapier mech multipliers tweaked"
|
||||
- tweak: "Mech katana damage bonus and AP increased"
|
||||
4
html/changelogs/AutoChangelog-pr-21098.yml
Normal file
4
html/changelogs/AutoChangelog-pr-21098.yml
Normal file
@@ -0,0 +1,4 @@
|
||||
author: "SapphicOverload"
|
||||
delete-after: true
|
||||
changes:
|
||||
- bugfix: "fixed snowstorms bypassing cold protection"
|
||||
4
html/changelogs/AutoChangelog-pr-21104.yml
Normal file
4
html/changelogs/AutoChangelog-pr-21104.yml
Normal file
@@ -0,0 +1,4 @@
|
||||
author: "bruhlookatthisdood"
|
||||
delete-after: true
|
||||
changes:
|
||||
- bugfix: "you can now hit the captain's gun case"
|
||||
@@ -1,4 +0,0 @@
|
||||
author: "ToasterBiome"
|
||||
delete-after: true
|
||||
changes:
|
||||
- mapping: "Removes arrival shuttle from NVS Gax, people spawn in cryo now"
|
||||
@@ -1533,7 +1533,6 @@
|
||||
#include "code\game\objects\structures\lavaland\geyser.dm"
|
||||
#include "code\game\objects\structures\lavaland\katana_grave.dm"
|
||||
#include "code\game\objects\structures\lavaland\necropolis_tendril.dm"
|
||||
#include "code\game\objects\structures\lavaland\steam_fissure.dm"
|
||||
#include "code\game\objects\structures\signs\_signs.dm"
|
||||
#include "code\game\objects\structures\signs\signs_departments.dm"
|
||||
#include "code\game\objects\structures\signs\signs_interactive.dm"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/datum/controller/subsystem/processing/quirks/proc/checkquirks(mob/living/user,client/cli) // Returns true when the player isn't trying to fuckin scum the mood pref stuff to exploit
|
||||
var/mob/living/carbon/human/U = user
|
||||
U.mood_enabled = CONFIG_GET(flag/force_human_mood) || cli.prefs.read_preference(/datum/preference/toggle/mood_enabled) // Marks whether this player had moods enabled in preferences at the time of spawning (helps prevent exploitation)
|
||||
U.mood_enabled = cli.prefs.read_preference(/datum/preference/toggle/mood_enabled) // Marks whether this player had moods enabled in preferences at the time of spawning (helps prevent exploitation)
|
||||
|
||||
var/ismoody = (!CONFIG_GET(flag/disable_human_mood) || (cli.prefs.read_preference(/datum/preference/toggle/mood_enabled))) // If moods are globally enabled, or this guy does indeed have his mood pref set to Enabled
|
||||
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
/mob/living/carbon/human
|
||||
var/gender_ambiguous = 0 //if something goes wrong during gender reassignment this generates a line in examine
|
||||
var/mood_enabled = FALSE // Marks whether this player had moods enabled in preferences at the time of spawning (helps prevent exploitation)
|
||||
var/mood_enabled = FALSE // Marks whether this player had moods enabled in preferences at the time of spawning (helps prevent exploitation)
|
||||
@@ -20,6 +20,7 @@
|
||||
siemens_coeff = 0.75 //I wouldn't make semiconductors out of plant material
|
||||
punchdamagehigh = 8 //sorry anvil your balance choice was wrong imo and I WILL be changing this soon.
|
||||
punchstunthreshold = 9
|
||||
payday_modifier = 0.7 //Neutrally viewed by NT
|
||||
mutantlungs = /obj/item/organ/lungs/plant //let them breathe CO2
|
||||
meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/plant
|
||||
disliked_food = MEAT | DAIRY | MICE | VEGETABLES | FRUIT | GRAIN | JUNKFOOD | FRIED | RAW | GROSS | BREAKFAST | GRILLED | EGG | CHOCOLATE | SEAFOOD | CLOTH
|
||||
|
||||
@@ -26,6 +26,7 @@
|
||||
punchdamagehigh = 7 //not built for large high speed acts like punches
|
||||
punchstunthreshold = 7 //technically better stunning
|
||||
siemens_coeff = 1.75 //Circuits REALLY don't like extra electricity flying around
|
||||
payday_modifier = 0.6 //Highly efficient workers, but significant political tension between SIC and Remnants = next to no protection or people willing to fight the obvious wage cut
|
||||
//mutant_bodyparts = list("head", "body_markings")
|
||||
mutanteyes = /obj/item/organ/eyes/robotic/preternis
|
||||
mutantlungs = /obj/item/organ/lungs/preternis
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 107 KiB After Width: | Height: | Size: 109 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 35 KiB After Width: | Height: | Size: 35 KiB |
Reference in New Issue
Block a user