"
dat += "Name: "
dat += "[real_name]"
@@ -428,6 +434,8 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
dat += "OOC notes: Edit
"
if(unlock_content)
dat += "BYOND Membership Publicity: [(toggles & MEMBER_PUBLIC) ? "Public" : "Hidden"]
"
+ if(user.client.donator_level >= DONATOR_LEVEL_ONE)
+ dat += "Donator Publicity: [(toggles & DONATOR_PUBLIC) ? "Public" : "Hidden"]
"
dat += "Randomized character slot: [randomslot ? "Yes" : "No"]
"
dat += "Ghost ears: [(toggles & CHAT_GHOSTEARS) ? "Nearest Creatures" : "All Speech"]
"
@@ -464,14 +472,18 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
total_cost += G.cost
var/fcolor = "#3366CC"
- if(total_cost < MAX_GEAR_COST)
+ if(total_cost < max_gear_slots)
fcolor = "#E67300"
dat += ""
- dat += "| [total_cost]/[MAX_GEAR_COST] loadout points spent. \[Clear Loadout\] | "
+ dat += "| [total_cost]/[max_gear_slots] loadout points spent. \[Clear Loadout\] | "
dat += ""
var/firstcat = 1
for(var/category in loadout_categories)
+ var/datum/loadout_category/LC = loadout_categories[category]
+ if(LC.donor_only)
+ if(user.client.donator_level < DONATOR_LEVEL_TWO) // level two donators get the donator loadout, so don't show it to anyone with less than that
+ continue
if(firstcat)
firstcat = 0
else
@@ -1097,6 +1109,10 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
if(TG.display_name in gear)
gear -= TG.display_name
else
+ if(TG.donor_only)
+ if(user.client.donator_level < DONATOR_LEVEL_TWO) // donator items are locked to > tier 2
+ //they normally can't even get this far- but just in case of href exploits, we check them here
+ return
var/total_cost = 0
var/list/type_blacklist = list()
for(var/gear_name in gear)
@@ -1108,7 +1124,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
type_blacklist += G.subtype_path
total_cost += G.cost
- if((total_cost + TG.cost) <= MAX_GEAR_COST)
+ if((total_cost + TG.cost) <= max_gear_slots)
gear += TG.display_name
else if(href_list["gear"] && href_list["tweak"])
@@ -1875,6 +1891,10 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
if(unlock_content)
toggles ^= MEMBER_PUBLIC
+ if("donor_public")
+ if(user.client.donator_level >= DONATOR_LEVEL_ONE)
+ toggles ^= DONATOR_PUBLIC
+
if("gender")
if(gender == MALE)
gender = FEMALE
diff --git a/code/modules/clothing/patreon/glasses.dm b/code/modules/clothing/patreon/glasses.dm
new file mode 100644
index 00000000000..8f795b212a2
--- /dev/null
+++ b/code/modules/clothing/patreon/glasses.dm
@@ -0,0 +1,21 @@
+/*
+ Donator Glasses Loadout for Patreon
+*/
+//Kamina shades
+/obj/item/clothing/glasses/fluff/kamina
+ name = "Spiky Orange-tinted Shades"
+ desc = "Row row!"
+ icon_state = "gar"
+ item_state = "gar"
+ species_fit = list("Vox")
+ sprite_sheets = list(
+ "Vox" = 'icons/mob/species/vox/eyes.dmi'
+ )
+
+
+//Green Kamina shades
+/obj/item/clothing/glasses/fluff/kamina/green
+ name = "Spiky Green-tinted Shades"
+ desc = "Fight the power!"
+ icon_state = "garm"
+ item_state = "garm"
\ No newline at end of file
diff --git a/code/modules/clothing/patreon/hats.dm b/code/modules/clothing/patreon/hats.dm
new file mode 100644
index 00000000000..bfcc69972e4
--- /dev/null
+++ b/code/modules/clothing/patreon/hats.dm
@@ -0,0 +1,63 @@
+/*
+ Donator Loadout for Patreon
+*/
+
+//mushroom hat
+/obj/item/clothing/head/fluff/mushhat
+ name = "Mushroom Hat"
+ desc = "A horrifying display of Nanotrasen's ruthless pursuit in being the forefront of fashion. Or genocide."
+ icon_state = "mushhat"
+ item_state = "mushhat"
+ flags = BLOCKHAIR
+ species_fit = list("Vox")
+ sprite_sheets = list(
+ "Vox" = 'icons/mob/species/vox/head.dmi'
+ )
+
+//gold top hat and recolours
+/obj/item/clothing/head/fluff/goldtophat
+ name = "Gold-trimmed Top Hat"
+ desc = "Poshness incarnate."
+ icon_state = "goldtophat"
+ item_state = "goldtophat"
+ species_fit = list("Vox")
+ sprite_sheets = list(
+ "Vox" = 'icons/mob/species/vox/head.dmi'
+ )
+
+
+/obj/item/clothing/head/fluff/goldtophat/blue
+ name = "Gold-trimmed Blue Top Hat"
+ desc = "Poshness incarnate. With blue."
+ icon_state = "goldtophatblue"
+ item_state = "goldtophatblue"
+
+/obj/item/clothing/head/fluff/goldtophat/red
+ name = "Gold-trimmed Red Top Hat"
+ desc = "Poshness incarnate. With red."
+ icon_state = "goldtophatred"
+ item_state = "goldtophatred"
+
+//medieval guard helm
+/obj/item/clothing/head/fluff/guardhelm
+ name = "Plastic Guard helm"
+ desc = "A plastic re-creation of a medieval-era headwear worn by extremely bored recruits of the local army. Kintergarden only."
+ icon_state = "guardhelm"
+ item_state = "guardhelm"
+ flags = BLOCKHAIR
+ species_fit = list("Vox")
+ sprite_sheets = list(
+ "Vox" = 'icons/mob/species/vox/head.dmi'
+ )
+
+//black sombrero
+/obj/item/clothing/head/fluff/blacksombrero
+ name = "Black sombrero"
+ desc = "A rare identifying hat of the infamous ancient renegade gang known as 'El Loco Pocos'"
+ icon_state = "blacksombrero"
+ item_state = "blacksombrero"
+ flags = BLOCKHAIR
+ species_fit = list("Vox")
+ sprite_sheets = list(
+ "Vox" = 'icons/mob/species/vox/head.dmi'
+ )
\ No newline at end of file
diff --git a/code/modules/computer3/computers/message.dm b/code/modules/computer3/computers/message.dm
index 3864082a8cb..35e981a4a7a 100644
--- a/code/modules/computer3/computers/message.dm
+++ b/code/modules/computer3/computers/message.dm
@@ -104,7 +104,7 @@
if(!auth)
dat += "
Please authenticate with the server in order to show additional options."
else
- dat += "
Reg, #514 forbids sending messages to a Head of Staff containing Erotic Rendering Properties."
+ dat += "
Reg, #514 forbids sending messages containing Erotic Rendering Properties."
//Message Logs
if(1)
diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index a5c1e69b847..3ced404f91b 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -446,6 +446,11 @@
/obj/item/clothing/head/hood/fluff/linda //Epic_Charger: Linda Clark
icon_state = "greenhood"
+/obj/item/clothing/suit/armor/shodanscoat // RazekPraxis: SHODAN
+ name = "SHODAN's Captain's Coat"
+ desc = "A black coat with gold trim and an old US Chevron printed on the back. Edgy."
+ icon_state = "shodancoat"
+
//////////// Uniforms ////////////
/obj/item/clothing/under/fluff/kharshai // Kharshai: Athena Castile
name = "Castile formal outfit"
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index bd0c3538462..37826ae0a10 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -378,7 +378,7 @@
message = "[src] faints."
if(src.sleeping)
return //Can't faint while asleep
- AdjustSleeping(1)
+ AdjustSleeping(2)
m_type = 1
if("cough", "coughs")
diff --git a/code/modules/mob/living/silicon/ai/freelook/chunk.dm b/code/modules/mob/living/silicon/ai/freelook/chunk.dm
index 71d80df9e02..eeeeed8e8bb 100644
--- a/code/modules/mob/living/silicon/ai/freelook/chunk.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/chunk.dm
@@ -114,7 +114,7 @@
var/turf/t = turf
if(obscuredTurfs[t])
if(!t.obscured)
- t.obscured = image('icons/effects/cameravis.dmi', t, "black", 15)
+ t.obscured = image('icons/effects/cameravis.dmi', t, null, 15)
obscured += t.obscured
for(var/eye in seenby)
diff --git a/code/modules/mob/living/simple_animal/tribbles.dm b/code/modules/mob/living/simple_animal/tribbles.dm
index b21c3110b1d..6a18da90aaa 100644
--- a/code/modules/mob/living/simple_animal/tribbles.dm
+++ b/code/modules/mob/living/simple_animal/tribbles.dm
@@ -212,9 +212,6 @@ var/global/totaltribbles = 0 //global variable so it updates for all tribbles,
//||Fur and Fur Products ||
-/obj
- var/f_amt = 0 // registers fur amount as an object variable
-
/obj/item/stack/sheet/fur //basic fur sheets (very lumpy furry piles of sheets)
name = "pile of fur"
@@ -223,38 +220,40 @@ var/global/totaltribbles = 0 //global variable so it updates for all tribbles,
icon = 'icons/mob/tribbles.dmi'
icon_state = "sheet-fur"
origin_tech = "materials=2"
- f_amt = 1000
max_amount = 50
+
/obj/item/clothing/ears/earmuffs/tribblemuffs //earmuffs but with tribbles
name = "earmuffs"
desc = "Protects your hearing from loud noises, and quiet ones as well."
icon = 'icons/mob/tribbles.dmi'
icon_state = "tribblemuffs"
item_state = "tribblemuffs"
- f_amt = 2000
+/* The advanced cold protection of the non-coat items has been removed, so as not
+ to give patreon donors an unfair advantage - the winter coat provides equivalent
+ cold protection
+*/
/obj/item/clothing/gloves/furgloves
desc = "These gloves are warm and furry."
name = "fur gloves"
icon = 'icons/mob/tribbles.dmi'
icon_state = "furglovesico"
item_state = "furgloves"
- f_amt = 3000
-
- cold_protection = HANDS
- min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
+ transfer_prints = TRUE
+ transfer_blood = TRUE
+ siemens_coefficient = 0
+// Equivalent to a winter coat's hood
/obj/item/clothing/head/furcap
name = "fur cap"
desc = "A warm furry cap."
icon = 'icons/mob/tribbles.dmi'
icon_state = "furcap"
item_state = "furcap"
- f_amt = 5000
cold_protection = HEAD
- min_cold_protection_temperature = HELMET_MIN_TEMP_PROTECT
+ min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
/obj/item/clothing/shoes/furboots
name = "fur boots"
@@ -262,11 +261,8 @@ var/global/totaltribbles = 0 //global variable so it updates for all tribbles,
icon = 'icons/mob/tribbles.dmi'
icon_state = "furboots"
item_state = "furboots"
- f_amt = 4000
-
- cold_protection = FEET
- min_cold_protection_temperature = SHOES_MIN_TEMP_PROTECT
+// As a donator piece of clothing, this is now in line with the winter coat
/obj/item/clothing/suit/furcoat
name = "fur coat"
desc = "A trenchcoat made from fur. You could put an oxygen tank in one of the pockets."
@@ -274,11 +270,10 @@ var/global/totaltribbles = 0 //global variable so it updates for all tribbles,
icon_state = "furcoat"
item_state = "furcoat"
blood_overlay_type = "armor"
- f_amt = 15000
- body_parts_covered = UPPER_TORSO|LEGS|ARMS|LOWER_TORSO
+ body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO
allowed = list (/obj/item/weapon/tank/emergency_oxygen)
- cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | ARMS
- min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
+ cold_protection = UPPER_TORSO | LOWER_TORSO | ARMS
+ min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
/obj/item/clothing/suit/furcape
name = "fur cape"
@@ -287,7 +282,6 @@ var/global/totaltribbles = 0 //global variable so it updates for all tribbles,
icon_state = "furcape"
item_state = "furcape"
blood_overlay_type = "armor"
- f_amt = 10000
- body_parts_covered = UPPER_TORSO|LEGS|ARMS
- cold_protection = UPPER_TORSO | LEGS | ARMS
- min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
+ body_parts_covered = UPPER_TORSO|ARMS
+ cold_protection = UPPER_TORSO | ARMS
+ min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
diff --git a/code/modules/mob/living/status_procs.dm b/code/modules/mob/living/status_procs.dm
index bc12dfdeb87..45207fd5426 100644
--- a/code/modules/mob/living/status_procs.dm
+++ b/code/modules/mob/living/status_procs.dm
@@ -411,7 +411,7 @@
/mob/living/SetStuttering(amount, force = 0)
//From mob/living/apply_effect: "Stuttering is often associated with Stun"
if(status_flags & CANSTUN || force)
- stuttering = max(stuttering, 0)
+ stuttering = max(amount, 0)
/mob/living/AdjustStuttering(amount, bound_lower = 0, bound_upper = INFINITY, force = 0)
var/new_value = directional_bounded_sum(stuttering, amount, bound_lower, bound_upper)
diff --git a/code/modules/mob/logout.dm b/code/modules/mob/logout.dm
index d83a5efe339..b9fed474cdf 100644
--- a/code/modules/mob/logout.dm
+++ b/code/modules/mob/logout.dm
@@ -3,15 +3,19 @@
unset_machine()
player_list -= src
log_access("Logout: [key_name(src)]")
- if(admin_datums[src.ckey])
- if(ticker && ticker.current_state == GAME_STATE_PLAYING) //Only report this stuff if we are currently playing.
- var/admins_number = admins.len
-
+ // `holder` is nil'd out by now, so we check the `admin_datums` array directly
+ //Only report this stuff if we are currently playing.
+ if(admin_datums[ckey] && ticker && ticker.current_state == GAME_STATE_PLAYING)
+ var/datum/admins/temp_admin = admin_datums[ckey]
+ // Triggers on people with banhammer power only - no mentors tripping the alarm
+ if(temp_admin.rights & R_BAN)
message_admins("Admin logout: [key_name_admin(src)]")
- if(admins_number == 0) //Apparently the admin logging out is no longer an admin at this point, so we have to check this towards 0 and not towards 1. Awell.
- send2adminirc("[key_name(src)] logged out - no more admins online.")
+ var/list/admincounter = staff_countup(R_BAN)
+ if(admincounter[1] == 0) // No active admins
+ send2irc(config.admin_notify_irc, "[key_name(src)] logged out - No active admins, [admincounter[2]] non-admin staff, [admincounter[3]] inactive staff.")
+
..()
-
- callHook("mob_logout", list("client" = client, "mob" = src))
-
- return 1
\ No newline at end of file
+
+ callHook("mob_logout", list("client" = client, "mob" = src))
+
+ return 1
diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm
index f0bcbfe0312..efaf84798d1 100644
--- a/code/modules/mob/new_player/preferences_setup.dm
+++ b/code/modules/mob/new_player/preferences_setup.dm
@@ -291,11 +291,20 @@
if(current_species && (current_species.bodyflags & HAS_TAIL))
var/tail_icon
var/tail_icon_state
+ var/tail_shift_x
+ var/tail_shift_y
+ var/blend_mode = ICON_ADD
if(body_accessory)
var/datum/body_accessory/accessory = body_accessory_by_name[body_accessory]
tail_icon = accessory.icon
tail_icon_state = accessory.icon_state
+ if(accessory.blend_mode)
+ blend_mode = accessory.blend_mode
+ if(accessory.pixel_x_offset)
+ tail_shift_x = accessory.pixel_x_offset
+ if(accessory.pixel_y_offset)
+ tail_shift_y = accessory.pixel_y_offset
else
tail_icon = "icons/effects/species.dmi"
if(coloured_tail)
@@ -303,10 +312,14 @@
else
tail_icon_state = "[current_species.tail]_s"
- var/icon/temp = new /icon("icon" = tail_icon, "icon_state" = tail_icon_state)
+ var/icon/temp = new/icon("icon" = tail_icon, "icon_state" = tail_icon_state)
+ if(tail_shift_x)
+ temp.Shift(EAST, tail_shift_x)
+ if(tail_shift_y)
+ temp.Shift(NORTH, tail_shift_y)
if(current_species && (current_species.bodyflags & HAS_SKIN_COLOR))
- temp.Blend(rgb(r_skin, g_skin, b_skin), ICON_ADD)
+ temp.Blend(rgb(r_skin, g_skin, b_skin), blend_mode)
if(current_species && (current_species.bodyflags & HAS_TAIL_MARKINGS))
var/tail_marking = m_styles["tail"]
diff --git a/code/modules/projectiles/guns/projectile/saw.dm b/code/modules/projectiles/guns/projectile/saw.dm
index 097f5fb4a58..d36ad1dd2c6 100644
--- a/code/modules/projectiles/guns/projectile/saw.dm
+++ b/code/modules/projectiles/guns/projectile/saw.dm
@@ -1,6 +1,6 @@
/obj/item/weapon/gun/projectile/automatic/l6_saw
name = "\improper L6 SAW"
- desc = "A heavily modified 7.62 light machine gun, designated 'L6 SAW'. Has 'Aussec Armoury - 2531' engraved on the reciever below the designation."
+ desc = "A heavily modified 5.56 light machine gun, designated 'L6 SAW'. Has 'Aussec Armoury - 2531' engraved on the reciever below the designation."
icon_state = "l6closed100"
item_state = "l6closedmag"
w_class = 5
diff --git a/code/modules/reagents/chemistry/reagents/toxins.dm b/code/modules/reagents/chemistry/reagents/toxins.dm
index 8b575be41a5..3b59ff8e0b7 100644
--- a/code/modules/reagents/chemistry/reagents/toxins.dm
+++ b/code/modules/reagents/chemistry/reagents/toxins.dm
@@ -326,9 +326,9 @@
/datum/reagent/beer2/on_mob_life(mob/living/M)
switch(current_cycle)
if(1 to 50)
- M.AdjustSleeping(1)
+ M.Sleeping(2)
if(51 to INFINITY)
- M.AdjustSleeping(1)
+ M.Sleeping(2)
M.adjustToxLoss((current_cycle - 50)*REAGENTS_EFFECT_MULTIPLIER)
..()
diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index 2a36ba585df..1e56d9d6d57 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -300,7 +300,7 @@
/obj/machinery/conveyor_switch/multitool_menu(var/mob/user, var/obj/item/device/multitool/P)
return {"
"}
diff --git a/code/modules/spacepods/spacepod.dm b/code/modules/spacepods/spacepod.dm
index 5a01cd5b09f..1c71f8837ee 100644
--- a/code/modules/spacepods/spacepod.dm
+++ b/code/modules/spacepods/spacepod.dm
@@ -141,6 +141,9 @@
qdel(ion_trail)
ion_trail = null
occupant_sanity_check()
+ if(pilot)
+ pilot.forceMove(get_turf(src))
+ pilot = null
if(passengers)
for(var/mob/M in passengers)
M.forceMove(get_turf(src))
@@ -226,29 +229,15 @@
health = max(0, health - damage)
var/percentage = (health / initial(health)) * 100
occupant_sanity_check()
- if(passengers && oldhealth > health && percentage <= 25 && percentage > 0)
- var/sound/S = sound('sound/effects/engine_alert2.ogg')
- S.wait = 0 //No queue
- S.channel = 0 //Any channel
- S.volume = 50
- for(var/mob/M in passengers)
- M << S
- if(passengers && oldhealth > health && !health)
- var/sound/S = sound('sound/effects/engine_alert1.ogg')
- S.wait = 0
- S.channel = 0
- S.volume = 50
- for(var/mob/M in passengers)
- M << S
+ if(oldhealth > health && percentage <= 25 && percentage > 0)
+ play_sound_to_riders('sound/effects/engine_alert2.ogg')
+ if(oldhealth > health && !health)
+ play_sound_to_riders('sound/effects/engine_alert1.ogg')
if(!health)
spawn(0)
- if(passengers)
- for(var/mob/M in passengers)
- to_chat(M, "Critical damage to the vessel detected, core explosion imminent!")
+ message_to_riders("Critical damage to the vessel detected, core explosion imminent!")
for(var/i = 10, i >= 0; --i)
- if(passengers)
- for(var/mob/M in passengers)
- to_chat(M, "[i]")
+ message_to_riders("[i]")
if(i == 0)
explosion(loc, 2, 4, 8)
qdel(src)
@@ -266,12 +255,13 @@
occupant_sanity_check()
switch(severity)
if(1)
- for(var/mob/M in passengers)
- var/mob/living/carbon/human/H = M
- if(H)
- H.forceMove(get_turf(src))
- H.ex_act(severity + 1)
- to_chat(H, "You are forcefully thrown from \the [src]!")
+ if(passengers || pilot)
+ for(var/mob/M in passengers | pilot)
+ var/mob/living/carbon/human/H = M
+ if(H)
+ H.forceMove(get_turf(src))
+ H.ex_act(severity + 1)
+ to_chat(H, "You are forcefully thrown from \the [src]!")
qdel(ion_trail)
qdel(src)
if(2)
@@ -283,27 +273,35 @@
/obj/spacepod/emp_act(severity)
occupant_sanity_check()
cargo_hold.emp_act(severity)
-
+
if(battery && battery.charge > 0)
battery.use((battery.charge / 2) / severity)
deal_damage(80 / severity)
if(empcounter < (40 / severity))
empcounter = 40 / severity
- processing_objects.Add(src)
-
+ processing_objects.Add(src)
+
switch(severity)
if(1)
- if(pilot)
- to_chat(pilot, "The pod console flashes 'Heavy EMP WAVE DETECTED'.")
- if(passengers)
- for(var/mob/M in passengers)
- to_chat(M, "The pod console flashes 'Heavy EMP WAVE DETECTED'.")
+ message_to_riders("The pod console flashes 'Heavy EMP WAVE DETECTED'.")
if(2)
- if(pilot)
- to_chat(pilot, "The pod console flashes 'EMP WAVE DETECTED'.")
- if(passengers)
- for(var/mob/M in passengers)
- to_chat(M, "The pod console flashes 'EMP WAVE DETECTED'.")
+ message_to_riders("The pod console flashes 'EMP WAVE DETECTED'.")
+
+/obj/spacepod/proc/play_sound_to_riders(mysound)
+ if(length(passengers | pilot) == 0)
+ return
+ var/sound/S = sound(mysound)
+ S.wait = 0 //No queue
+ S.channel = 0 //Any channel
+ S.volume = 50
+ for(var/mob/M in passengers | pilot)
+ M << S
+
+/obj/spacepod/proc/message_to_riders(mymessage)
+ if(length(passengers | pilot) == 0)
+ return
+ for(var/mob/M in passengers | pilot)
+ to_chat(M, mymessage)
/obj/spacepod/attackby(obj/item/W as obj, mob/user as mob, params)
if(user.a_intent == I_HARM)
diff --git a/config/example/config.txt b/config/example/config.txt
index f2087eebaa2..31bde9c5e4f 100644
--- a/config/example/config.txt
+++ b/config/example/config.txt
@@ -248,6 +248,9 @@ GHOST_INTERACTION
## IRC channel to send adminhelps to. Leave blank to disable adminhelps-to-irc.
#ADMIN_IRC #admin
+## IRC channel to send direct messages to admins to. Leave blank to disable.
+#ADMIN_NOTIFY_IRC #paradiseStaff
+
## Path to the python2 executable on the system. Leave blank for default.
## Default is "python" on Windows, "/usr/bin/env python2" on UNIX.
#PYTHON_PATH pythonw
diff --git a/html/browser/common.css b/html/browser/common.css
index 8c0a0253599..23b675f7fa2 100644
--- a/html/browser/common.css
+++ b/html/browser/common.css
@@ -339,4 +339,10 @@ div.notice
{
width: 100%;
clear: both;
+}
+.charPreview
+{
+ -ms-interpolation-mode: nearest-neighbor;
+ width: 64px;
+ height:64px;
}
\ No newline at end of file
diff --git a/html/changelog.html b/html/changelog.html
index 53a7d4c62c0..549ebcdccca 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,94 @@
-->
+ 05 December 2016
+ KasparoVy updated:
+
+ - Resolves an issue where cloned vampires could no longer drain blood, burn in the chapel or use their powers properly.
+
+
+ 04 December 2016
+ KasparoVy updated:
+
+ - Resolves an issue with changeling regenerative stasis where changelings who initiated it while alive and died during the waiting period did not come back to life. Now they will, as intended.
+
+
+ 03 December 2016
+ Kyep updated:
+
+ - the anti-ERP warning message on PDA message consoles is now accurate.
+
+
+ 01 December 2016
+ Crazylemon64 updated:
+
+ - Cryo tubes no longer let you excessively multiply the efficiency of touch chems
+
+ KasparoVy updated:
+
+ - The character preview icon in character creation is now more detailed and less blurry.
+ - ID cards now show tails, body accessories and tail markings correctly.
+
+ Twinmold93 updated:
+
+ - Pilots of spacepods will no longer be sent to the void when the space pod is destroyed in any method.
+ - Pilots of spacepods will now get the same warnings for damage/core destruction that passengers get.
+
+
+ 29 November 2016
+ KasparoVy updated:
+
+ - Head, body and tail markings are now loaded correctly from genes (UI).
+ - Changes to a person's skin-tone gene are now immediately apparent.
+
+
+ 28 November 2016
+ Allfd updated:
+
+ - Fixes an issue with the processing of GitHub changelog emoji in the php webhook.
+
+ Crazylemon64 updated:
+
+ - The RCD no longer shall work as a remote permissions control
+
+ KasparoVy updated:
+
+ - Pressing the light switch in one OR will no longer turn off the lights for both.
+ - The fire alarms in each OR now work independently of each-other.
+ - The second operating room now has its own APC and wiring.
+
+
+ 26 November 2016
+ Fox McCloud updated:
+
+ - Fixes faint emote doing nothing
+ - Fixes Mickey Finn's Special Brew not functioning properly/not making you fall asleep
+
+
+ 23 November 2016
+ Fethas updated:
+
+ - Fixes human jetpacks..maybe...
+
+ FlattestNerd updated:
+
+ - the e20 will now get logged when it goes BEWM, as it should.
+
+ Fox McCloud updated:
+
+ - Fixes double-breaking news newscaster
+
+
+ 22 November 2016
+ KasparoVy updated:
+
+ - You now stutter when you're in shock/crit and when you've got the nervous disability as you used to.
+
+ Twinmold93 updated:
+
+ - Runtime caused by lack of settlers in the Orion arcade game.
+
+
20 November 2016
KasparoVy updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index fd632854ff1..6ee4b5b32e0 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -3081,3 +3081,61 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
KasparoVy:
- bugfix: The DNA SE injectors one can find in the abandoned mining crates now correctly
activate/deactivate the powers they may contain.
+2016-11-22:
+ KasparoVy:
+ - bugfix: You now stutter when you're in shock/crit and when you've got the nervous
+ disability as you used to.
+ Twinmold93:
+ - bugfix: Runtime caused by lack of settlers in the Orion arcade game.
+2016-11-23:
+ Fethas:
+ - bugfix: Fixes human jetpacks..maybe...
+ FlattestNerd:
+ - tweak: the e20 will now get logged when it goes BEWM, as it should.
+ Fox McCloud:
+ - bugfix: Fixes double-breaking news newscaster
+2016-11-26:
+ Fox McCloud:
+ - bugfix: Fixes faint emote doing nothing
+ - bugfix: Fixes Mickey Finn's Special Brew not functioning properly/not making you
+ fall asleep
+2016-11-28:
+ Allfd:
+ - bugfix: Fixes an issue with the processing of GitHub changelog emoji in the php
+ webhook.
+ Crazylemon64:
+ - bugfix: The RCD no longer shall work as a remote permissions control
+ KasparoVy:
+ - bugfix: Pressing the light switch in one OR will no longer turn off the lights
+ for both.
+ - tweak: The fire alarms in each OR now work independently of each-other.
+ - rscadd: The second operating room now has its own APC and wiring.
+2016-11-29:
+ KasparoVy:
+ - bugfix: Head, body and tail markings are now loaded correctly from genes (UI).
+ - bugfix: Changes to a person's skin-tone gene are now immediately apparent.
+2016-12-01:
+ Crazylemon64:
+ - bugfix: Cryo tubes no longer let you excessively multiply the efficiency of touch
+ chems
+ KasparoVy:
+ - tweak: The character preview icon in character creation is now more detailed and
+ less blurry.
+ - bugfix: ID cards now show tails, body accessories and tail markings correctly.
+ Twinmold93:
+ - bugfix: Pilots of spacepods will no longer be sent to the void when the space
+ pod is destroyed in any method.
+ - bugfix: Pilots of spacepods will now get the same warnings for damage/core destruction
+ that passengers get.
+2016-12-03:
+ Kyep:
+ - tweak: the anti-ERP warning message on PDA message consoles is now accurate.
+2016-12-04:
+ KasparoVy:
+ - bugfix: Resolves an issue with changeling regenerative stasis where changelings
+ who initiated it while alive and died during the waiting period did not come
+ back to life. Now they will, as intended.
+2016-12-05:
+ KasparoVy:
+ - bugfix: Resolves an issue where cloned vampires could no longer drain blood, burn
+ in the chapel or use their powers properly.
diff --git a/html/changelogs/AutoChangeLog-pr-5827.yml b/html/changelogs/AutoChangeLog-pr-5827.yml
deleted file mode 100644
index ce5ae36c21b..00000000000
--- a/html/changelogs/AutoChangeLog-pr-5827.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Twinmold93"
-delete-after: True
-changes:
- - bugfix: "Runtime caused by lack of settlers in the Orion arcade game."
diff --git a/icons/effects/cameravis.dmi b/icons/effects/cameravis.dmi
index 25dbc6c8e0e..378c19bad45 100644
Binary files a/icons/effects/cameravis.dmi and b/icons/effects/cameravis.dmi differ
diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi
index 02bbf79ad76..9d8462c03c5 100644
Binary files a/icons/mob/eyes.dmi and b/icons/mob/eyes.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index e0cc9a7e997..b3af414cde5 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/inhands/clothing_lefthand.dmi b/icons/mob/inhands/clothing_lefthand.dmi
index 9aed5172330..34e2a6ce696 100644
Binary files a/icons/mob/inhands/clothing_lefthand.dmi and b/icons/mob/inhands/clothing_lefthand.dmi differ
diff --git a/icons/mob/inhands/clothing_righthand.dmi b/icons/mob/inhands/clothing_righthand.dmi
index c0c5dbd8678..2753f52dfee 100644
Binary files a/icons/mob/inhands/clothing_righthand.dmi and b/icons/mob/inhands/clothing_righthand.dmi differ
diff --git a/icons/mob/species/vox/head.dmi b/icons/mob/species/vox/head.dmi
index ae10eaa4b5c..21ed6e38001 100644
Binary files a/icons/mob/species/vox/head.dmi and b/icons/mob/species/vox/head.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index 022ad5e407c..31be4923470 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index a3d78f0a1c9..63af8386202 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index 47a1c97a9a9..e45908cb152 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi
index 5a198ee1e64..4380c3a34bb 100644
Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ
diff --git a/icons/ooc_tag_16x.dmi b/icons/ooc_tag_16x.dmi
new file mode 100644
index 00000000000..2165a593220
Binary files /dev/null and b/icons/ooc_tag_16x.dmi differ
diff --git a/icons/turf/areas.dmi b/icons/turf/areas.dmi
index 4baa2b25ae6..baf07678ed8 100755
Binary files a/icons/turf/areas.dmi and b/icons/turf/areas.dmi differ
diff --git a/paradise.dme b/paradise.dme
index fc6303fd746..b66cc8dd006 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -1116,6 +1116,7 @@
#include "code\modules\client\preference\loadout\loadout.dm"
#include "code\modules\client\preference\loadout\loadout_accessories.dm"
#include "code\modules\client\preference\loadout\loadout_cosmetics.dm"
+#include "code\modules\client\preference\loadout\loadout_donor.dm"
#include "code\modules\client\preference\loadout\loadout_general.dm"
#include "code\modules\client\preference\loadout\loadout_hat.dm"
#include "code\modules\client\preference\loadout\loadout_shoes.dm"
@@ -1141,6 +1142,8 @@
#include "code\modules\clothing\masks\gasmask.dm"
#include "code\modules\clothing\masks\miscellaneous.dm"
#include "code\modules\clothing\masks\voice.dm"
+#include "code\modules\clothing\patreon\glasses.dm"
+#include "code\modules\clothing\patreon\hats.dm"
#include "code\modules\clothing\shoes\colour.dm"
#include "code\modules\clothing\shoes\magboots.dm"
#include "code\modules\clothing\shoes\miscellaneous.dm"
diff --git a/tools/github_webhook_processor.php b/tools/github_webhook_processor.php
index 26a08418d69..c27a7eb4c5b 100644
--- a/tools/github_webhook_processor.php
+++ b/tools/github_webhook_processor.php
@@ -20,7 +20,7 @@
//Github lets you have it sign the message with a secret that you can validate. This prevents people from faking events.
//This var should match the secret you configured for this webhook on github.
-//set to NULL (no quotes) to disable validation.
+//This is required as otherwise somebody could trick the script into leaking the api key.
$hookSecret = '08ajh0qj93209qj90jfq932j32r';
//Api key for pushing changelogs.
@@ -49,27 +49,36 @@ set_exception_handler(function($e) {
die();
});
$rawPost = NULL;
-if ($hookSecret !== NULL) {
- if (!isset($_SERVER['HTTP_X_HUB_SIGNATURE'])) {
- throw new \Exception("HTTP header 'X-Hub-Signature' is missing.");
- } elseif (!extension_loaded('hash')) {
- throw new \Exception("Missing 'hash' extension to check the secret code validity.");
- }
- list($algo, $hash) = explode('=', $_SERVER['HTTP_X_HUB_SIGNATURE'], 2) + array('', '');
- if (!in_array($algo, hash_algos(), TRUE)) {
- throw new \Exception("Hash algorithm '$algo' is not supported.");
- }
- $rawPost = file_get_contents('php://input');
- if ($hash !== hash_hmac($algo, $rawPost, $hookSecret)) {
- throw new \Exception('Hook secret does not match.');
- }
+if (!$hookSecret || $hookSecret == '08ajh0qj93209qj90jfq932j32r')
+ throw new \Exception("Hook secret is required and can not be default");
+if (!isset($_SERVER['HTTP_X_HUB_SIGNATURE'])) {
+ throw new \Exception("HTTP header 'X-Hub-Signature' is missing.");
+} elseif (!extension_loaded('hash')) {
+ throw new \Exception("Missing 'hash' extension to check the secret code validity.");
}
+list($algo, $hash) = explode('=', $_SERVER['HTTP_X_HUB_SIGNATURE'], 2) + array('', '');
+if (!in_array($algo, hash_algos(), TRUE)) {
+ throw new \Exception("Hash algorithm '$algo' is not supported.");
+}
+$rawPost = file_get_contents('php://input');
+if ($hash !== hash_hmac($algo, $rawPost, $hookSecret)) {
+ throw new \Exception('Hook secret does not match.');
+}
+
+$contenttype = null;
+//apache and nginx/fastcgi/phpfpm call this two different things.
if (!isset($_SERVER['HTTP_CONTENT_TYPE'])) {
- throw new \Exception("Missing HTTP 'Content-Type' header.");
-} elseif (!isset($_SERVER['HTTP_X_GITHUB_EVENT'])) {
+ if (!isset($_SERVER['CONTENT_TYPE']))
+ throw new \Exception("Missing HTTP 'Content-Type' header.");
+ else
+ $contenttype = $_SERVER['CONTENT_TYPE'];
+} else {
+ $contenttype = $_SERVER['HTTP_CONTENT_TYPE'];
+}
+if (!isset($_SERVER['HTTP_X_GITHUB_EVENT'])) {
throw new \Exception("Missing HTTP 'X-Github-Event' header.");
}
-switch ($_SERVER['HTTP_CONTENT_TYPE']) {
+switch ($contenttype) {
case 'application/json':
$json = $rawPost ?: file_get_contents('php://input');
break;
@@ -77,7 +86,7 @@ switch ($_SERVER['HTTP_CONTENT_TYPE']) {
$json = $_POST['payload'];
break;
default:
- throw new \Exception("Unsupported content type: $_SERVER[HTTP_CONTENT_TYPE]");
+ throw new \Exception("Unsupported content type: $contenttype");
}
# Payload structure depends on triggered event
# https://developer.github.com/v3/activity/events/types/
@@ -146,14 +155,14 @@ function checkchangelog($payload, $merge = false) {
$foundcltag = false;
foreach ($body as $line) {
$line = trim($line);
- if (substr($line,0,4) == ':cl:') {
+ if (substr($line,0,4) == ':cl:' || substr($line,0,4) == '🆑') {
$incltag = true;
$foundcltag = true;
$pos = strpos($line, " ");
if ($pos)
$username = substr($line, $pos+1);
continue;
- } else if (substr($line,0,5) == '/:cl:' || substr($line,0,6) == '/ :cl:' || substr($line,0,5) == ':/cl:') {
+ } else if (substr($line,0,5) == '/:cl:' || substr($line,0,6) == '/ :cl:' || substr($line,0,5) == ':/cl:' || substr($line,0,5) == '/🆑' || substr($line,0,6) == '/ 🆑' ) {
$incltag = false;
$changelogbody = array_merge($changelogbody, $currentchangelogblock);
continue;
@@ -242,7 +251,7 @@ function checkchangelog($payload, $merge = false) {
if (!count($changelogbody))
return;
- $file = 'author: '.$username."\n";
+ $file = 'author: "'.trim(str_replace(array("\\", '"'), array("\\\\", "\\\""), $username)).'"'."\n";
$file .= "delete-after: True\n";
$file .= "changes: \n";
foreach ($changelogbody as $changelogitem) {
@@ -252,8 +261,9 @@ function checkchangelog($payload, $merge = false) {
$file .= "\n";
}
$content = array (
- 'message' => 'Automatic changelog generation for PR #'.$payload['pull_request']['number'],
- 'content' => base64_encode($file)
+ 'branch' => $payload['pull_request']['base']['ref'],
+ 'message' => 'Automatic changelog generation for PR #'.$payload['pull_request']['number'].' [ci skip]',
+ 'content' => base64_encode($file)
);
$scontext = array('http' => array(
'method' => 'PUT',
@@ -342,4 +352,4 @@ function export($addr, $port, $str) {
$error = true;
return "ERROR";
}
-?>
+?>
\ No newline at end of file
| |
