Merge pull request #1252 from CHOMPStationBot/upstream-merge-9645

[MIRROR] The clime offices
This commit is contained in:
Razgriz
2021-02-13 15:14:02 -07:00
committed by GitHub
11 changed files with 1895 additions and 263 deletions

View File

@@ -10,6 +10,7 @@
#define LANGUAGE_ENOCHIAN "Enochian"
#define LANGUAGE_VESPINAE "Vespinae"
#define LANGUAGE_SPACER "Spacer"
#define LANGUAGE_CLOWNISH "Coulrian"
#define LANGUAGE_CHIMPANZEE "Chimpanzee"
#define LANGUAGE_NEAERA "Neaera"

View File

@@ -28,3 +28,21 @@ var/const/access_pilot = 67
id = access_entertainment
desc = "Entertainment Backstage"
region = ACCESS_REGION_GENERAL
/var/const/access_mime = 138
/datum/access/mime
id = access_mime
desc = "Mime Office"
region = ACCESS_REGION_GENERAL
/var/const/access_clown = 136
/datum/access/clown
id = access_clown
desc = "Clown Office"
region = ACCESS_REGION_GENERAL
/var/const/access_tomfoolery = 137
/datum/access/tomfoolery
id = access_tomfoolery
desc = "Tomfoolery Closet"
region = ACCESS_REGION_GENERAL

View File

@@ -26,13 +26,13 @@
access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, access_morgue,
access_crematorium, access_kitchen, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_lawyer,
access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station,
access_hop, access_RC_announce, access_keycard_auth)
access_hop, access_RC_announce, access_clown, access_tomfoolery, access_mime, access_keycard_auth)
minimal_access = list(access_security, access_sec_doors, access_brig, access_forensics_lockers,
access_medical, access_engine, access_change_ids, access_ai_upload, access_eva, access_heads,
access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, access_morgue,
access_crematorium, access_kitchen, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_lawyer,
access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station,
access_hop, access_RC_announce, access_keycard_auth)
access_hop, access_RC_announce, access_clown, access_tomfoolery, access_mime, access_keycard_auth)
/datum/alt_title/deputy_director
title = "Deputy Director"

View File

@@ -79,14 +79,14 @@
departments = list(DEPARTMENT_CIVILIAN)
department_flag = CIVILIAN
faction = "Station"
total_positions = -1
spawn_positions = -1
total_positions = -1 //CHOMP Edit: Disable. Change to + integer to enable.
spawn_positions = -1 //CHOMP Edit: Disable. Change to + integer to enable.
supervisors = "the spirit of laughter"
selection_color = "#515151"
economic_modifier = 1
job_description = "A Clown is there to entertain the crew and keep high morale using various harmless pranks and ridiculous jokes!"
whitelist_only = 1
latejoin_only = 1
latejoin_only = 0
outfit_type = /decl/hierarchy/outfit/job/clown
pto_type = PTO_CIVILIAN
alt_titles = list("Jester" = /datum/alt_title/jester, "Fool" = /datum/alt_title/fool)
@@ -99,9 +99,9 @@
/datum/job/clown/get_access()
if(config.assistant_maint)
return list(access_maint_tunnels, access_entertainment)
return list(access_maint_tunnels, access_entertainment, access_clown, access_tomfoolery)
else
return list(access_entertainment)
return list(access_entertainment, access_clown, access_tomfoolery)
/datum/job/mime
title = "Mime"
@@ -109,15 +109,15 @@
departments = list(DEPARTMENT_CIVILIAN)
department_flag = CIVILIAN
faction = "Station"
total_positions = -1
spawn_positions = -1
total_positions = -1 //CHOMP Edit: Disable. Change to + integer to enable.
spawn_positions = -1 //CHOMP Edit: Disable. Change to + integer to enable.
supervisors = "the spirit of performance"
selection_color = "#515151"
economic_modifier = 1
job_description = "A Mime is there to entertain the crew and keep high morale using unbelievable performances and acting skills!"
alt_titles = list("Poseur" = /datum/alt_title/poseur)
whitelist_only = 1
latejoin_only = 1
latejoin_only = 0
outfit_type = /decl/hierarchy/outfit/job/mime
pto_type = PTO_CIVILIAN
@@ -126,6 +126,6 @@
/datum/job/mime/get_access()
if(config.assistant_maint)
return list(access_maint_tunnels, access_entertainment)
return list(access_maint_tunnels, access_entertainment, access_tomfoolery, access_mime)
else
return list(access_entertainment)
return list(access_entertainment, access_tomfoolery, access_mime)

View File

@@ -119,6 +119,20 @@
"ver", "stv", "pro", "ski"
)
/datum/language/clownish
name = LANGUAGE_CLOWNISH
desc = "A special elective language course for those studying at the Clown Planet Institute."
speech_verb = "honks"
ask_verb = "seins"
exclaim_verb = "crenks"
whisper_verb = "squeaks"
colour = "#F785F2" // Pink for the clown.
key = "<"
flags = WHITELISTED | CLOWN
syllables = list(
"honk", "knock", "salt", "slip", "lube", "banana", "flower", "pie", "did you hear", "🅱️", "haha", "bully", "going up",
)
/datum/language/drudakar
name = LANGUAGE_DRUDAKAR
desc = "The native language of the D'Rudak'Ar, a loosely tied together community of dragons and demi-dragons based in the Diul system. Features include many hard consonants and rolling 'r's."

View File

@@ -0,0 +1,94 @@
/mob/living/simple_mob/animal/passive/honkpet
name = "Hinkle"
desc = "The Silence into Laughter program mass produces these excessively hardy animals for each member to raise and take care of. They often switch personalities when smacked."
tt_desc = "Coulrian Honkus"
icon = 'icons/mob/animal_vr.dmi'
icon_state = "c_pet"
icon_living = "c_pet"
icon_dead = "c_pet_dead"
maxHealth = 1500
health = 1500
minbodytemp = 175 // Same as Sif mobs.
response_help = "pokes"
response_disarm = "subverts"
response_harm = "smacks"
harm_intent_damage = 0
melee_damage_lower = 0
melee_damage_upper = 0
attacktext = list("honked")
armor = list(
"melee" = 80,
"bullet" = 20,
"laser" = 0,
"energy" = 0,
"bomb" = 0,
"bio" = 0,
"rad" = 0
)
armor_soak = list(
"melee" = 80,
"bullet" = 20,
"laser" = 0,
"energy" = 0,
"bomb" = 0,
"bio" = 0,
"rad" = 0
)
has_langs = list("Coulrian")
/mob/living/simple_mob/animal/passive/honkpet/attack_hand(mob/living/user as mob)
if(user.a_intent == I_DISARM)
return icon_state = pick("c_pet", "m_pet")
.=..()
/mob/living/simple_mob/animal/passive/mimepet
name = "Dave"
desc = "That's Dave."
tt_desc = "Polypodavesilencia"
icon = 'icons/mob/animal_vr.dmi'
icon_state = "dave1"
icon_living = "dave1"
icon_dead = "dave_dead"
movement_cooldown = 300
maxHealth = 1500
health = 1500
minbodytemp = 175 // Same as Sif mobs.
response_help = "pokes"
response_disarm = "shuffles"
response_harm = "smacks"
harm_intent_damage = 0
melee_damage_lower = 0
melee_damage_upper = 0
attacktext = list("...")
armor = list(
"melee" = 80,
"bullet" = 20,
"laser" = 0,
"energy" = 0,
"bomb" = 0,
"bio" = 0,
"rad" = 0
)
armor_soak = list(
"melee" = 80,
"bullet" = 20,
"laser" = 0,
"energy" = 0,
"bomb" = 0,
"bio" = 0,
"rad" = 0
)
/mob/living/simple_mob/animal/passive/mimepet/attack_hand(mob/living/user as mob)
if(user.a_intent == I_DISARM)
icon_state = pick("dave1", "dave2", "dave3", "dave5" , "dave6" , "dave7" , "dave8" , "dave9" , "dave10")
.=..()

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 25 KiB

File diff suppressed because it is too large Load Diff

View File

@@ -34445,6 +34445,22 @@
/obj/machinery/vending/snack,
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/breakroom)
"etU" = (
/obj/machinery/door/airlock/maintenance_hatch{
req_one_access = list(746)
},
/turf/simulated/floor/plating,
/area/tether/surfacebase/funny/hideyhole)
"eKn" = (
/turf/simulated/floor/plating,
/area/tether/surfacebase/funny/hideyhole)
"frf" = (
/obj/item/weapon/paper{
info = "I finally got them. The last pair of Shitty Tim's Shitty Timbs. I waited in line at the cargo shop for what seemed like hours. It probably was hours quite frankly. Well after I got my box, someone ran by and jacked my heels! Well I needed shoes so I snuck inside and stole what they had left. Just a pair of NT worshoes. But atleast I'm not walking away barefooted. If only I wasn't caught by a security. I feel like I've been in this hole for days. Good thing I managed to pilfer some provisions on the way here.";
name = "Pilferer's note"
},
/turf/simulated/floor/plating,
/area/tether/surfacebase/funny/hideyhole)
"fxr" = (
/obj/machinery/light{
dir = 8
@@ -34456,6 +34472,23 @@
/obj/structure/table/glass,
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/breakroom)
"gwn" = (
/obj/item/trash/snack_bowl,
/obj/item/trash/sosjerky,
/obj/item/trash/sosjerky,
/obj/item/trash/sosjerky,
/obj/item/trash/unajerky,
/obj/item/trash/waffles,
/obj/structure/closet/crate/trashcart,
/obj/item/trash/cheesie,
/obj/item/trash/cheesie,
/turf/simulated/floor/plating,
/area/tether/surfacebase/funny/hideyhole)
"jCz" = (
/turf/simulated/wall{
can_open = 1
},
/area/tether/surfacebase/public_garden_two)
"kPb" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -34515,6 +34548,38 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/tether/surfacebase/surface_two_hall)
<<<<<<< HEAD
||||||| parent of 7c76d267c9... Merge pull request #9645 from SweetBlueSylveon/The-Clime-Offices
"mUP" = (
/obj/structure/bed/padded,
/obj/effect/floor_decal/techfloor,
/obj/machinery/firealarm{
pixel_y = -26
},
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/bar)
"mWq" = (
/obj/structure/catwalk,
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/south)
=======
"mCl" = (
/obj/machinery/floodlight,
/turf/simulated/floor/plating,
/area/tether/surfacebase/funny/hideyhole)
"mUP" = (
/obj/structure/bed/padded,
/obj/effect/floor_decal/techfloor,
/obj/machinery/firealarm{
pixel_y = -26
},
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/bar)
"mWq" = (
/obj/structure/catwalk,
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/south)
>>>>>>> 7c76d267c9... Merge pull request #9645 from SweetBlueSylveon/The-Clime-Offices
"nFT" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -34530,6 +34595,7 @@
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/breakroom)
<<<<<<< HEAD
<<<<<<< HEAD
"oXI" = (
/obj/structure/railing{
dir = 1;
@@ -34577,6 +34643,16 @@
/area/maintenance/lower/north)
=======
>>>>>>> 7ed3f13340... Merge pull request #9546 from Detective-Google/map-fixes
||||||| parent of 7c76d267c9... Merge pull request #9645 from SweetBlueSylveon/The-Clime-Offices
=======
"olc" = (
/obj/item/weapon/grenade/chem_grenade/cleaner{
pixel_x = -10
},
/obj/item/weapon/grenade/anti_photon,
/turf/simulated/floor/plating,
/area/tether/surfacebase/funny/hideyhole)
>>>>>>> 7c76d267c9... Merge pull request #9645 from SweetBlueSylveon/The-Clime-Offices
"pah" = (
/obj/machinery/door/firedoor/glass,
/obj/machinery/door/airlock{
@@ -34630,6 +34706,55 @@
},
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/breakroom)
<<<<<<< HEAD
||||||| parent of 7c76d267c9... Merge pull request #9645 from SweetBlueSylveon/The-Clime-Offices
"sVf" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/button/windowtint{
dir = 1;
id = "chaplainpet";
name = "interior window tint";
pixel_x = -4;
pixel_y = 30
},
/turf/simulated/floor/tiled/dark,
/area/chapel/main)
=======
"shd" = (
/obj/item/weapon/storage/rollingpapers,
/obj/item/clothing/mask/smokable/cigarette/joint,
/obj/item/clothing/mask/smokable/cigarette/joint,
/obj/item/clothing/mask/smokable/cigarette/cigar/cohiba,
/obj/item/clothing/mask/smokable/cigarette/cigar/cohiba,
/obj/item/weapon/flame/lighter/zippo/moff,
/turf/simulated/floor/plating,
/area/tether/surfacebase/funny/hideyhole)
"sVf" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/button/windowtint{
dir = 1;
id = "chaplainpet";
name = "interior window tint";
pixel_x = -4;
pixel_y = 30
},
/turf/simulated/floor/tiled/dark,
/area/chapel/main)
>>>>>>> 7c76d267c9... Merge pull request #9645 from SweetBlueSylveon/The-Clime-Offices
"sZp" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -34692,6 +34817,23 @@
/obj/structure/catwalk,
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/mining)
<<<<<<< HEAD
||||||| parent of 7c76d267c9... Merge pull request #9645 from SweetBlueSylveon/The-Clime-Offices
"tPB" = (
/turf/simulated/floor/grass,
/area/chapel/main)
=======
"tPB" = (
/turf/simulated/floor/grass,
/area/chapel/main)
"uay" = (
/obj/item/clothing/shoes/syndigaloshes{
desc = "A pair of Nanotrasen Saf-T-Stride brown, nonslip, shoes.";
name = "NT nonslips"
},
/turf/simulated/floor/plating,
/area/tether/surfacebase/funny/hideyhole)
>>>>>>> 7c76d267c9... Merge pull request #9645 from SweetBlueSylveon/The-Clime-Offices
"unM" = (
/obj/effect/floor_decal/corner/paleblue/diagonal,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -34699,6 +34841,13 @@
/obj/structure/table/glass,
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/breakroom)
"uHy" = (
/obj/structure/bed/chair{
dir = 4
},
/obj/effect/decal/remains/human,
/turf/simulated/floor/plating,
/area/tether/surfacebase/funny/hideyhole)
"uKv" = (
/obj/effect/floor_decal/corner/paleblue/diagonal,
/obj/machinery/light{
@@ -39153,9 +39302,9 @@ adt
adt
adt
adt
adt
adt
adt
frf
shd
uHy
adt
adt
adt
@@ -39295,9 +39444,9 @@ adt
adt
adt
adt
adt
adt
adt
olc
eKn
eKn
adt
adt
adt
@@ -39433,12 +39582,12 @@ adt
adt
adt
adt
adt
adt
adt
adt
adt
adt
eKn
eKn
etU
etU
eKn
uay
adt
adt
adt
@@ -39574,13 +39723,13 @@ adt
adt
adt
adt
eKn
eKn
adt
adt
adt
adt
adt
adt
adt
gwn
mCl
adt
adt
adt
@@ -39711,12 +39860,12 @@ apn
anf
aro
asr
akX
akX
adt
adt
adt
adt
jCz
jCz
eKn
eKn
eKn
eKn
adt
adt
adt

View File

@@ -495,6 +495,22 @@
name = "\improper Entertainment Stage"
icon_state = "library"
/area/tether/surfacebase/funny/clownoffice
name = "\improper Clown's Office"
icon_state = "library"
/area/tether/surfacebase/funny/mimeoffice
name = "\improper Mime's Office"
icon_state = "library"
/area/tether/surfacebase/funny/tomfoolery
name = "\improper Tomfoolery Closet"
icon_state = "library"
/area/tether/surfacebase/funny/hideyhole
name = "\improper Pilferer's Hole"
icon_state = "library"
/area/tether/surfacebase/entertainment/backstage
name = "\improper Entertainment Backstage"
icon_state = "library"

View File

@@ -3066,6 +3066,7 @@
#include "code\modules\mob\living\simple_mob\subtypes\slime\xenobio\subtypes_vr.dm"
#include "code\modules\mob\living\simple_mob\subtypes\slime\xenobio\xenobio.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\bee.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\c_pet.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\catgirl.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\chungus.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\cookiegirl.dm"