cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-27 06:54:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bay merge fixes (#1225)

Browse Source 
What is being fixed:
-messed up sec armor
-skeleton, vox and resomi being player species
-abhumans also had restrictions added until whatever should be done with them was decided or something
-fixing dionae language name
-fixing bluespace suicide and some additions/changes
-fixing random vaurca name gen thing
-fixing missing ipc chest and groin sprites
-added missing resomi hair and some new dank vox hair styles
This commit is contained in:
Alberyk
2016-12-18 10:52:16 +02:00
committed by skull132
parent 8b986c9644
commit 89ae849adc
21 changed files with 157 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/bluespacetech.dm
+36 -14
View File
@@ -89,7 +89,7 @@
bst.add_language("Siik'maas")
bst.add_language("Skrellian")
bst.add_language("Vox-pidgin")
bst.add_language(LANGUAGE_ROOTSPEAK)
bst.add_language("Rootsong")
bst.add_language("Ceti Basic")
bst.add_language("Sol Common")
bst.add_language("Tradeband")
@@ -124,7 +124,7 @@
binarycheck()
return 1
/* suicide()
proc/suicide()
if(key && species.name != "Human")
switch(species.name)
if("Tajara")
@@ -137,6 +137,8 @@
bsu()
if("Skrell")
bss()
if("Vaurca")
bsv()
return
src.custom_emote(1,"presses a button on their suit, followed by a polite bow.")
@@ -157,7 +159,7 @@
ghost.real_name = "[ghost.key] BSTech"
ghost.voice_name = "[ghost.key] BSTech"
qdel(src)
return*/
return
proc/bsc() //because we all have our unrealistic snowflakes right?
if(set_species("Tajara"))
@@ -177,7 +179,7 @@
else
ghostize(0)
key = null
//suicide()
suicide()
proc/bsb()
if(set_species("Machine"))
@@ -196,7 +198,7 @@
else
ghostize(0)
key = null
//suicide()
suicide()
proc/bsd()
if(set_species("Diona"))
@@ -214,26 +216,26 @@
else
ghostize(0)
key = null
//suicide()
suicide()
proc/bsu()
if(set_species("Unathi"))
h_style = "Unathi Horns"
name = "Bluespace Snake"
voice_name = "Bluespace Snake"
real_name = "Bluespace Snake"
mind.name = "Bluespace Snake"
name = "Bluespace Lizard"
voice_name = "Bluespace Lizard"
real_name = "Bluespace Lizard"
mind.name = "Bluespace Lizard"
if(wear_id)
var/obj/item/weapon/card/id/id = wear_id
if(istype(wear_id, /obj/item/device/pda))
var/obj/item/device/pda/pda = wear_id
id = pda.id
id.registered_name = "Bluespace Snake"
id.registered_name = "Bluespace Lizard"
regenerate_icons()
else
ghostize(0)
key = null
//suicide()
suicide()
proc/bss()
if(set_species("Skrell"))
@@ -253,7 +255,26 @@
else
ghostize(0)
key = null
// suicide()
suicide()
proc/bsv()
if(set_species("Vaurca"))
h_style = "Bald"
name = "Bluespace Bug"
voice_name = "Bluespace Bug"
real_name = "Bluespace Bug"
mind.name = "Bluespace Bug"
if(wear_id)
var/obj/item/weapon/card/id/id = wear_id
if(istype(wear_id, /obj/item/device/pda))
var/obj/item/device/pda/pda = wear_id
id = pda.id
id.registered_name = "Bluespace Bug"
regenerate_icons()
else
ghostize(0)
key = null
suicide()
say(var/message)
var/verb = "says in a subdued tone"
@@ -302,7 +323,7 @@
C.holder.original_mob.key = key
C.holder.original_mob = null
// suicide()
suicide()
//Equipment. All should have canremove set to 0
//All items with a /bst need the attack_hand() proc overrided to stop people getting overpowered items.
@@ -384,6 +405,7 @@
desc = "A pair of sunglasses, these look modified, 'BST' marked on the side."
// var/list/obj/item/clothing/glasses/hud/health/hud = null
vision_flags = (SEE_TURFS|SEE_OBJS|SEE_MOBS)
see_invisible = SEE_INVISIBLE_NOLIGHTING
canremove = 0
/* New()
..()
code/modules/clothing/spacesuits/void/station.dm
+1 -3
View File
@@ -67,7 +67,6 @@
slot_r_hand_str = "sec_helm",
)
armor = list(melee = 60, bullet = 10, laser = 30, energy = 5, bomb = 45, bio = 100, rad = 10)
siemens_coefficient = 0.7
light_overlay = "helmet_light_dual"
/obj/item/clothing/suit/space/void/security
@@ -77,7 +76,6 @@
item_state = "sec_voidsuit"
armor = list(melee = 60, bullet = 10, laser = 30, energy = 5, bomb = 45, bio = 100, rad = 10)
allowed = list(/obj/item/weapon/gun,/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/melee/baton)
siemens_coefficient = 0.7
//Atmospherics Rig (BS12)
/obj/item/clothing/head/helmet/space/void/atmos
@@ -98,4 +96,4 @@
name = "atmos voidsuit"
item_state = "atmos_voidsuit"
armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 50)
max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE
max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE
code/modules/clothing/suits/armor.dm
+14 -8
View File
@@ -315,24 +315,30 @@
icon_state = "ertarmor_med"
//New Vests
/obj/item/clothing/suit/armor/vest
/obj/item/clothing/suit/storage/vest
name = "armor vest"
desc = "An armor vest made of synthetic fibers."
desc = "A simple kevlar plate carrier."
icon_state = "kvest"
item_state = "armor"
item_state = "kvest"
armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
allowed = list(/obj/item/weapon/gun,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/device/flashlight)
siemens_coefficient = 0.5
/obj/item/clothing/suit/storage/vest/officer
name = "security armor vest"
desc = "A synthetic armor vest with SECURITY printed in red lettering on the chest. This one has added webbing and ballistic plates."
icon_state = "officervest"
name = "officer armor vest"
desc = "A simple kevlar plate carrier belonging to Nanotrasen. This one has a security holobadge clipped to the chest."
icon_state = "officervest_nobadge"
item_state = "officervest_nobadge"
icon_badge = "officervest_badge"
icon_nobadge = "officervest_nobadge"
/obj/item/clothing/suit/storage/vest/warden
name = "warden armor vest"
desc = "A synthetic armor vest with WARDEN printed in silver lettering on the chest. This one has added webbing and ballistic plates."
icon_state = "wardenvest"
desc = "A simple kevlar plate carrier belonging to Nanotrasen. This one has a silver badge clipped to the chest."
icon_state = "wardenvest_nobadge"
item_state = "wardenvest_nobadge"
icon_badge = "wardenvest_badge"
icon_nobadge = "wardenvest_nobadge"
/obj/item/clothing/suit/storage/vest/hos
name = "commander armor vest"
code/modules/mob/language/station.dm
+1 -1
View File
@@ -1,5 +1,5 @@
/datum/language/diona
name = LANGUAGE_ROOTSPEAK
name = LANGUAGE_ROOTSONG
desc = "A creaking, subvocal language spoken instinctively by the Dionaea. Due to the unique makeup of the average Diona, a phrase of Rootspeak can be a combination of anywhere from one to twelve individual voices and notes."
speech_verb = "creaks and rustles"
ask_verb = "creaks"
code/modules/mob/living/carbon/human/species/outsider/skeleton.dm
+2 -1
View File
@@ -39,7 +39,8 @@
breath_type = null
poison_type = null
flags = IS_RESTRICTED | NO_BLOOD | NO_SCAN | NO_SLIP | NO_POISON | NO_PAIN | NO_BREATHE
flags = NO_BLOOD | NO_SCAN | NO_SLIP | NO_POISON | NO_PAIN | NO_BREATHE
spawn_flags = IS_RESTRICTED
has_limbs = list(
"chest" = list("path" = /obj/item/organ/external/chest/skeleton),
code/modules/mob/living/carbon/human/species/outsider/vox.dm
+2 -1
View File
@@ -108,7 +108,8 @@
"brain" = /obj/item/organ/pariah_brain,
"eyes" = /obj/item/organ/eyes
)
flags = IS_RESTRICTED | NO_SCAN | HAS_EYE_COLOR
flags = NO_SCAN | HAS_EYE_COLOR
spawn_flags = IS_RESTRICTED
// No combat skills for you.
/datum/species/vox/pariah/can_shred(var/mob/living/carbon/human/H, var/ignore_intent)
code/modules/mob/living/carbon/human/species/station/human_subspecies.dm
+6
View File
@@ -13,6 +13,8 @@
radiation_mod = 0.5
brute_mod = 0.85
slowdown = 1
spawn_flags = IS_RESTRICTED
/datum/species/human/spacer
name = "space-adapted Human"
@@ -27,6 +29,8 @@
flash_mod = 1.2
brute_mod = 1.1
burn_mod = 1.1
spawn_flags = IS_RESTRICTED
/datum/species/human/vatgrown
name = "vat-grown Human"
@@ -45,6 +49,8 @@
"brain" = /obj/item/organ/brain,
"eyes" = /obj/item/organ/eyes
)
spawn_flags = IS_RESTRICTED
/*
// These guys are going to need full resprites of all the suits/etc so I'm going to
code/modules/mob/living/carbon/human/species/station/resomi.dm
+1 -1
View File
@@ -32,7 +32,7 @@
short_sighted = 1
gluttonous = GLUT_TINY
spawn_flags = CAN_JOIN | IS_WHITELISTED
spawn_flags = IS_RESTRICTED
appearance_flags = HAS_HAIR_COLOR | HAS_SKIN_COLOR | HAS_EYE_COLOR
bump_flag = MONKEY
swap_flags = MONKEY|SLIME|SIMPLE_ANIMAL
code/modules/mob/living/carbon/human/species/station/station.dm
+8 -5
View File
@@ -195,7 +195,7 @@
icobase = 'icons/mob/human_races/r_diona.dmi'
deform = 'icons/mob/human_races/r_def_plant.dmi'
language = "Ceti Basic"
default_language = LANGUAGE_ROOTSPEAK
default_language = LANGUAGE_ROOTSONG
unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/diona)
//primitive_form = "Nymph"
slowdown = 7
@@ -205,7 +205,7 @@
eyes = "blank_eyes"
show_ssd = "completely quiescent"
num_alternate_languages = 1
name_language = "Rootspeak"
name_language = "Rootsong"
ethanol_resistance = -1//Can't get drunk
blurb = "Commonly referred to (erroneously) as 'plant people', the Dionaea are a strange space-dwelling collective \
@@ -336,11 +336,12 @@
icobase = 'icons/mob/human_races/r_machine.dmi'
deform = 'icons/mob/human_races/r_machine.dmi'
language = "Encoded Audio Language"
unarmed_types = list(/datum/unarmed_attack/punch)
rarity_value = 2
num_alternate_languages = 1 // potentially could be 2?
name_language = "Encoded Audio Language"
num_alternate_languages = 2
secondary_langs = list("Encoded Audio Language")
ethanol_resistance = -1//Can't get drunk
eyes = "blank_eyes"
@@ -437,6 +438,7 @@
language = "Hivenet"
icobase = 'icons/mob/human_races/r_vaurca.dmi'
deform = 'icons/mob/human_races/r_vaurca.dmi'
name_language = "Hivenet"
unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp)
rarity_value = 4
slowdown = 0 //may become a bonus if vaurca gain more legs.
@@ -465,7 +467,8 @@
heat_level_1 = 330 //Default 360
heat_level_2 = 380 //Default 400
heat_level_3 = 600 //Default 1000
flags = CAN_JOIN | NO_SCAN | HAS_SKIN_COLOR | IS_WHITELISTED | NO_SLIP
flags = NO_SCAN | HAS_SKIN_COLOR | NO_SLIP
spawn_flags = CAN_JOIN | IS_WHITELISTED
blood_color = "#E6E600" // dark yellow
flesh_color = "#E6E600"
base_color = "#575757"
code/modules/mob/living/silicon/ai/ai.dm
+1 -1
View File
@@ -152,7 +152,7 @@ var/list/ai_verbs_default = list(
add_language("Tradeband", 1)
add_language("Gutter", 0)
add_language("Hivenet", 0)
add_language(LANGUAGE_ROOTSPEAK, 0)
add_language("Rootsong", 0)
add_language(LANGUAGE_EAL, 1)
if(!safety)//Only used by AIize() to successfully spawn an AI.
code/modules/mob/living/silicon/pai/software_modules.dm
+2 -2
View File
@@ -472,13 +472,13 @@
user.add_language("Siik'maas")
user.add_language("Skrellian")
// user.add_language("Vaurcese")
user.add_language(LANGUAGE_ROOTSPEAK)
user.add_language("Rootsong")
else
user.remove_language("Sinta'unathi")
user.remove_language("Siik'maas")
user.remove_language("Skrellian")
//user.add_language("Hivenet") //I can buy an AI core and its cyborgs having access to the local hivenet for security reasons, but a pAI?
user.add_language(LANGUAGE_ROOTSPEAK)
user.add_language("Rootsong")
is_active(mob/living/silicon/pai/user)
return user.translator_on
code/modules/mob/new_player/sprite_accessories.dm
+10
View File
@@ -798,6 +798,16 @@
icon_state = "vox_shortquills"
species_allowed = list("Vox")
vox_quills_kingly
name = "Kingly Vox Quills"
icon_state = "vox_kingly"
species_allowed = list("Vox")
vox_quills_mohawk
name = "Quill Mohawk"
icon_state = "vox_mohawk"
species_allowed = list("Vox")
//ipc screens
icp_screen_pink
code/modules/organs/subtypes/machine.dm
+2 -2
View File
@@ -108,7 +108,7 @@
/obj/item/organ/mmi_holder
name = "brain"
organ_tag = "brain"
parent_organ = "chest"
parent_organ = "head"
vital = 1
var/obj/item/device/mmi/stored_mmi
@@ -154,4 +154,4 @@
update_from_mmi()
else
stored_mmi.loc = get_turf(src)
qdel(src)
qdel(src)
code/modules/research/xenoarchaeology/misc.dm
-1
View File
@@ -105,7 +105,6 @@
new /obj/item/weapon/pickaxe/hand(src)
new /obj/item/weapon/storage/bag/fossils(src)
new /obj/item/weapon/hand_labeler(src)
new /obj/item/taperoll/research(src)
return
//---- Isolation room air alarms