cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 04:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Polaris sync

Browse Source
This commit is contained in:
killer653
2016-12-27 08:21:55 -05:00
parent ffa494e58f 525643eb02
commit 9c359cb202
30 changed files with 1280 additions and 911 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/client/preference_setup/loadout/loadout_uniform.dm
View File

@@ -411,11 +411,11 @@
display_name = "sweater, grey"
path = /obj/item/clothing/under/rank/psych/turtleneck/sweater
/datum/gear/uniform/jumpsuit/aether
/datum/gear/uniform/brandsuit/aether
display_name = "jumpsuit, aether"
path = /obj/item/clothing/under/aether
/datum/gear/uniform/jumpsuit/focal
/datum/gear/uniform/brandsuit/focal
display_name = "jumpsuit, focal"
path = /obj/item/clothing/under/focal
@@ -430,11 +430,11 @@
cost = 2
allowed_roles = list("Security Officer","Head of Security","Warden")
/datum/gear/uniform/jumpsuit/grayson
/datum/gear/uniform/brandsuit/grayson
display_name = "outfit, grayson"
path = /obj/item/clothing/under/grayson
/datum/gear/uniform/jumpsuit/wardt
/datum/gear/uniform/brandsuit/wardt
display_name = "jumpsuit, ward-takahashi"
path = /obj/item/clothing/under/wardt
@@ -442,6 +442,6 @@
display_name = "outfit, frontier"
path = /obj/item/clothing/under/frontier
/datum/gear/uniform/jumpsuit/hephaestus
/datum/gear/uniform/brandsuit/hephaestus
display_name = "jumpsuit, hephaestus"
path = /obj/item/clothing/under/hephaestus

4
code/modules/client/preference_setup/loadout/loadout_utility.dm
View File

@@ -51,6 +51,10 @@
path = /obj/item/device/flashlight/maglight
cost = 2
/datum/gear/utility/battery
display_name = "cell, device"
path = /obj/item/weapon/cell/device
/datum/gear/utility/implant //This does nothing if you don't actually know EAL.
display_name = "implant, language, EAL"
path = /obj/item/weapon/implant/language/eal

97
code/modules/materials/fifty_spawner_mats.dm Normal file
View File

@@ -0,0 +1,97 @@
//see /code/game/objects/items/stacks/fifty_spawner.dm for details on this
/obj/fiftyspawner/iron
name = "stack of iron"
material = "material/iron"
/obj/fiftyspawner/sandstone
name = "stack of sandstone"
material = "material/sandstone"
/obj/fiftyspawner/marble
name = "stack of marble"
material = "material/marble"
/obj/fiftyspawner/diamond
name = "stack of diamond"
material = "material/diamond"
/obj/fiftyspawner/uranium
name = "stack of uranium"
material = "material/uranium"
/obj/fiftyspawner/phoron
name = "stack of phoron"
material = "material/phoron"
/obj/fiftyspawner/plastic
name = "stack of plastic"
material = "material/plastic"
/obj/fiftyspawner/gold
name = "stack of gold"
material = "material/gold"
/obj/fiftyspawner/silver
name = "stack of silver"
material = "material/silver"
/obj/fiftyspawner/platinum
name = "stack of platinum"
material = "material/platinum"
/obj/fiftyspawner/mhydrogen
name = "stack of mhydrogen"
material = "material/mhydrogen"
/obj/fiftyspawner/tritium
name = "stack of tritium"
material = "material/tritium"
/obj/fiftyspawner/osmium
name = "stack of osmium"
material = "material/osmium"
/obj/fiftyspawner/steel
name = "stack of steel"
material = "material/steel"
/obj/fiftyspawner/plasteel
name = "stack of plasteel"
material = "material/plasteel"
/obj/fiftyspawner/durasteel
name = "stack of durasteel"
material = "material/durasteel"
/obj/fiftyspawner/wood
name = "stack of wood"
material = "material/wood"
/obj/fiftyspawner/cloth
name = "stack of cloth"
material = "material/cloth"
/obj/fiftyspawner/cardboard
name = "stack of cardboard"
material = "material/cardboard"
/obj/fiftyspawner/leather
name = "stack of leather"
material = "material/leather"
/obj/fiftyspawner/glass
name = "stack of glass"
material = "material/glass"
/obj/fiftyspawner/rglass
name = "stack of reinforced glass"
material = "material/glass/reinforced"
/obj/fiftyspawner/phoronglass
name = "stack of borosilicate glass"
material = "material/glass/phoronglass"
/obj/fiftyspawner/phoronrglass
name = "stack of reinforced borosilicate glass"
material = "material/glass/phoronrglass"

73
code/modules/materials/material_sheets.dm
View File

@@ -1,4 +1,5 @@
// Stacked resources. They use a material datum for a lot of inherited values.
// If you're adding something here, make sure to add it to fifty_spawner_mats.dm as well
/obj/item/stack/material
force = 5.0
throwforce = 5
@@ -92,91 +93,58 @@
default_type = "iron"
apply_colour = 1
/obj/item/stack/material/iron/fifty
amount = 50
/obj/item/stack/material/sandstone
name = "sandstone brick"
icon_state = "sheet-sandstone"
default_type = "sandstone"
/obj/item/stack/material/sandstone/fifty
amount = 50
/obj/item/stack/material/marble
name = "marble brick"
icon_state = "sheet-marble"
default_type = "marble"
/obj/item/stack/material/marble/fifty
amount = 50
/obj/item/stack/material/diamond
name = "diamond"
icon_state = "sheet-diamond"
default_type = "diamond"
/obj/item/stack/material/diamond/fifty
amount = 50
/obj/item/stack/material/uranium
name = "uranium"
icon_state = "sheet-uranium"
default_type = "uranium"
/obj/item/stack/material/uranium/fifty
amount = 50
/obj/item/stack/material/phoron
name = "solid phoron"
icon_state = "sheet-phoron"
default_type = "phoron"
/obj/item/stack/material/phoron/fifty
amount = 50
/obj/item/stack/material/plastic
name = "plastic"
icon_state = "sheet-plastic"
default_type = "plastic"
/obj/item/stack/material/plastic/fifty
amount = 50
/obj/item/stack/material/gold
name = "gold"
icon_state = "sheet-gold"
default_type = "gold"
/obj/item/stack/material/gold/fifty
amount = 50
/obj/item/stack/material/silver
name = "silver"
icon_state = "sheet-silver"
default_type = "silver"
/obj/item/stack/material/silver/fifty
amount = 50
//Valuable resource, cargo can sell it.
/obj/item/stack/material/platinum
name = "platinum"
icon_state = "sheet-adamantine"
default_type = "platinum"
/obj/item/stack/material/platinum/fifty
amount = 50
//Extremely valuable to Research.
/obj/item/stack/material/mhydrogen
name = "metallic hydrogen"
icon_state = "sheet-mythril"
default_type = "mhydrogen"
/obj/item/stack/material/mhydrogen/fifty
amount = 50
//Fuel for MRSPACMAN generator.
/obj/item/stack/material/tritium
name = "tritium"
@@ -184,92 +152,59 @@
default_type = "tritium"
apply_colour = 1
/obj/item/stack/material/tritium/fifty
amount = 50
/obj/item/stack/material/osmium
name = "osmium"
icon_state = "sheet-silver"
default_type = "osmium"
apply_colour = 1
/obj/item/stack/material/osmium/fifty
amount = 50
/obj/item/stack/material/steel
name = DEFAULT_WALL_MATERIAL
icon_state = "sheet-metal"
default_type = DEFAULT_WALL_MATERIAL
/obj/item/stack/material/steel/fifty
amount = 50
/obj/item/stack/material/plasteel
name = "plasteel"
icon_state = "sheet-plasteel"
default_type = "plasteel"
/obj/item/stack/material/plasteel/fifty
amount = 50
/obj/item/stack/material/durasteel
name = "durasteel"
icon_state = "sheet-durasteel"
item_state = "sheet-metal"
default_type = "durasteel"
/obj/item/stack/material/durasteel/fifty
amount = 50
/obj/item/stack/material/wood
name = "wooden plank"
icon_state = "sheet-wood"
default_type = "wood"
/obj/item/stack/material/wood/fifty
amount = 50
/obj/item/stack/material/cloth
name = "cloth"
icon_state = "sheet-cloth"
default_type = "cloth"
/obj/item/stack/material/cloth/fifty
amount = 50
/obj/item/stack/material/cardboard
name = "cardboard"
icon_state = "sheet-card"
default_type = "cardboard"
/obj/item/stack/material/cardboard/fifty
amount = 50
/obj/item/stack/material/leather
name = "leather"
desc = "The by-product of mob grinding."
icon_state = "sheet-leather"
default_type = "leather"
/obj/item/stack/material/leather/fifty
amount = 50
/obj/item/stack/material/glass
name = "glass"
icon_state = "sheet-glass"
default_type = "glass"
/obj/item/stack/material/glass/fifty
amount = 50
/obj/item/stack/material/glass/reinforced
name = "reinforced glass"
icon_state = "sheet-rglass"
default_type = "rglass"
/obj/item/stack/material/glass/reinforced/fifty
amount = 50
/obj/item/stack/material/glass/phoronglass
name = "borosilicate glass"
desc = "This sheet is special platinum-glass alloy designed to withstand large temperatures"
@@ -277,15 +212,9 @@
icon_state = "sheet-phoronglass"
default_type = "borosilicate glass"
/obj/item/stack/material/glass/phoronglass/fifty
amount = 50
/obj/item/stack/material/glass/phoronrglass
name = "reinforced borosilicate glass"
desc = "This sheet is special platinum-glass alloy designed to withstand large temperatures. It is reinforced with few rods."
singular_name = "reinforced borosilicate glass sheet"
icon_state = "sheet-phoronrglass"
default_type = "reinforced borosilicate glass"
/obj/item/stack/material/glass/phoronrglass/fifty
amount = 50

2
code/modules/mob/living/carbon/human/species/station/seromi.dm
View File

@@ -6,7 +6,7 @@
hunting skills that emphasized taking out their prey without themselves getting hit. They \
are only recently becoming known on human stations after reaching space with Skrell assistance."
num_alternate_languages = 2
num_alternate_languages = 3
secondary_langs = list("Schechi", "Skrellian")
name_language = "Schechi"
min_age = 12

6
code/modules/mob/living/silicon/robot/drone/drone_items.dm
View File

@@ -134,7 +134,8 @@
can_hold = list(
/obj/item/mecha_parts/part,
/obj/item/mecha_parts/mecha_equipment
/obj/item/mecha_parts/mecha_equipment,
/obj/item/mecha_parts/mecha_tracking
)
/obj/item/weapon/gripper/no_use //Used when you want to hold and put items in other things, but not able to 'use' the item
@@ -182,7 +183,8 @@
force_holder = wrapped.force
wrapped.force = 0.0
wrapped.attack(M,user)
if(deleted(wrapped))
M.attackby(wrapped, user) //attackby reportedly gets procced by being clicked on, at least according to Anewbe.
if(deleted(wrapped) || wrapped.loc != src.loc)
wrapped = null
return 1
return 0

6
code/modules/mob/mob_movement.dm
View File

@@ -270,9 +270,9 @@
if("run")
if(mob.drowsyness > 0)
move_delay += 6
move_delay += 1+config.run_speed
move_delay += config.run_speed
if("walk")
move_delay += 7+config.walk_speed
move_delay += config.walk_speed
move_delay += mob.movement_delay()
var/tickcomp = 0 //moved this out here so we can use it for vehicles
@@ -351,7 +351,7 @@
M.animate_movement = 2
return
else
else
if(mob.confused)
switch(mob.m_intent)
if("run")

46
code/modules/random_map/drop/drop_types.dm
View File

@@ -266,15 +266,15 @@ datum/supply_drop_loot/riot
/datum/supply_drop_loot/materials/New()
..()
contents = list(
/obj/item/stack/material/steel/fifty,
/obj/item/stack/material/steel/fifty,
/obj/item/stack/material/steel/fifty,
/obj/item/stack/material/glass/fifty,
/obj/item/stack/material/glass/fifty,
/obj/item/stack/material/wood/fifty,
/obj/item/stack/material/plastic/fifty,
/obj/item/stack/material/glass/reinforced/fifty,
/obj/item/stack/material/plasteel/fifty)
/obj/fiftyspawner/steel,
/obj/fiftyspawner/steel,
/obj/fiftyspawner/steel,
/obj/fiftyspawner/glass,
/obj/fiftyspawner/glass,
/obj/fiftyspawner/wood,
/obj/fiftyspawner/plastic,
/obj/fiftyspawner/rglass,
/obj/fiftyspawner/plasteel)
/datum/supply_drop_loot/materials_advanced
name = "Advanced Materials"
@@ -282,20 +282,20 @@ datum/supply_drop_loot/riot
/datum/supply_drop_loot/materials_advanced/New()
..()
contents = list(
/obj/item/stack/material/steel/fifty,
/obj/item/stack/material/glass/fifty,
/obj/item/stack/material/wood/fifty,
/obj/item/stack/material/plastic/fifty,
/obj/item/stack/material/glass/reinforced/fifty,
/obj/item/stack/material/plasteel/fifty,
/obj/item/stack/material/diamond/fifty,
/obj/item/stack/material/phoron/fifty,
/obj/item/stack/material/gold/fifty,
/obj/item/stack/material/silver/fifty,
/obj/item/stack/material/platinum/fifty,
/obj/item/stack/material/mhydrogen/fifty,
/obj/item/stack/material/tritium/fifty,
/obj/item/stack/material/osmium/fifty,)
/obj/fiftyspawner/steel,
/obj/fiftyspawner/glass,
/obj/fiftyspawner/wood,
/obj/fiftyspawner/plastic,
/obj/fiftyspawner/rglass,
/obj/fiftyspawner/plasteel,
/obj/fiftyspawner/diamond,
/obj/fiftyspawner/phoron,
/obj/fiftyspawner/gold,
/obj/fiftyspawner/silver,
/obj/fiftyspawner/platinum,
/obj/fiftyspawner/mhydrogen,
/obj/fiftyspawner/tritium,
/obj/fiftyspawner/osmium,)
/datum/supply_drop_loot/supermatter
name = "Supermatter"

14
code/modules/reagents/reagent_containers/glass.dm
View File

@@ -6,6 +6,7 @@
name = " "
var/base_name = " "
desc = " "
var/base_desc = " "
icon = 'icons/obj/chemical.dmi'
icon_state = "null"
item_state = "null"
@@ -48,6 +49,7 @@
/obj/item/weapon/reagent_containers/glass/New()
..()
base_name = name
base_desc = desc
/obj/item/weapon/reagent_containers/glass/examine(var/mob/user)
if(!..(user, 2))
@@ -99,8 +101,12 @@
/obj/item/weapon/reagent_containers/glass/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W, /obj/item/weapon/pen) || istype(W, /obj/item/device/flashlight/pen))
var/tmp_label = sanitizeSafe(input(user, "Enter a label for [name]", "Label", label_text), MAX_NAME_LEN)
if(length(tmp_label) > 10)
user << "<span class='notice'>The label can be at most 10 characters long.</span>"
if(length(tmp_label) > 50)
user << "<span class='notice'>The label can be at most 50 characters long.</span>"
else if(length(tmp_label) > 10)
user << "<span class='notice'>You set the label.</span>"
label_text = tmp_label
update_name_label()
else
user << "<span class='notice'>You set the label to \"[tmp_label]\".</span>"
label_text = tmp_label
@@ -109,8 +115,12 @@
/obj/item/weapon/reagent_containers/glass/proc/update_name_label()
if(label_text == "")
name = base_name
else if(length(label_text) > 10)
var/short_label_text = copytext(label_text, 1, 11)
name = "[base_name] ([short_label_text]...)"
else
name = "[base_name] ([label_text])"
desc = "[base_desc] It is labeled \"[label_text]\"."
/obj/item/weapon/reagent_containers/glass/beaker
name = "beaker"

15
code/modules/research/rdmachines.dm
View File

@@ -36,20 +36,19 @@
/obj/machinery/r_n_d/proc/getMaterialName(var/type)
switch(type)
//50-stacks weren't working despite being a subtype of the others, let's just force it in
if(/obj/item/stack/material/steel, /obj/item/stack/material/steel/fifty)
if(/obj/item/stack/material/steel)
return DEFAULT_WALL_MATERIAL
if(/obj/item/stack/material/glass, /obj/item/stack/material/glass/fifty)
if(/obj/item/stack/material/glass)
return "glass"
if(/obj/item/stack/material/gold, /obj/item/stack/material/gold/fifty)
if(/obj/item/stack/material/gold)
return "gold"
if(/obj/item/stack/material/silver, /obj/item/stack/material/silver/fifty)
if(/obj/item/stack/material/silver)
return "silver"
if(/obj/item/stack/material/phoron, /obj/item/stack/material/phoron/fifty)
if(/obj/item/stack/material/phoron)
return "phoron"
if(/obj/item/stack/material/uranium, /obj/item/stack/material/uranium/fifty)
if(/obj/item/stack/material/uranium)
return "uranium"
if(/obj/item/stack/material/diamond, /obj/item/stack/material/diamond/fifty)
if(/obj/item/stack/material/diamond)
return "diamond"
/obj/machinery/r_n_d/proc/eject(var/material, var/amount)