-
Notifications
You must be signed in to change notification settings - Fork 789
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.
Already on GitHub? Sign in to your account
Combat Robots Race #8301
Combat Robots Race #8301
Changes from 6 commits
e4f970a
5332d45
51eb3cf
536b2d2
4950647
e10e0ec
0a2401c
58daa04
281ab04
3a91e80
0512ddb
500afd9
273e8c9
8bd36a8
ffd7abe
ea7fa48
d75ca36
d21a3ee
f3b1eee
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -39,10 +39,12 @@ GLOBAL_LIST_EMPTY_TYPED(namepool, /datum/namepool) | |
/datum/namepool/sectoid/get_random_name() | ||
return "Sectoid [rand(1,9)]X[ascii2text(rand(65, 87))]" //65 to 87 is (uppercase) A to W | ||
|
||
/datum/namepool/vatborn/get_random_name(gender = MALE) | ||
/datum/namepool/vatborn/ | ||
firstname_male_pool = "names/first_male" | ||
firstname_female_pool = "names/first_female" | ||
|
||
/datum/namepool/vatborn/get_random_name(gender = MALE) | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. randome empty line |
||
if(gender == MALE) | ||
. = pick(SSstrings.get_list_from_file(firstname_male_pool)) | ||
else | ||
|
@@ -56,3 +58,10 @@ GLOBAL_LIST_EMPTY_TYPED(namepool, /datum/namepool) | |
firstname_male_pool = "names/skeleton" | ||
firstname_female_pool = "names/skeleton" | ||
lastname_pool = "names/skeleton" | ||
|
||
/datum/namepool/robotic | ||
firstname_female_pool = "names/robotic" | ||
|
||
/datum/namepool/robotic/get_random_name(gender = MALE) | ||
. = pick(SSstrings.get_list_from_file(firstname_female_pool)) | ||
. += "-[rand(1,999)]" //pathfinder-738 or such |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -286,6 +286,7 @@ A good representation is: 'byond applies a volume reduction to the sound every X | |
S = pick('sound/voice/alien_queen_command.ogg','sound/voice/alien_queen_command2.ogg','sound/voice/alien_queen_command3.ogg') | ||
if("alien_ventpass") | ||
S = pick('sound/effects/alien_ventpass1.ogg', 'sound/effects/alien_ventpass2.ogg') | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. random line There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. on purpose, this switch is hard to read at times |
||
// Human | ||
if("male_scream") | ||
S = pick('sound/voice/human_male_scream_1.ogg','sound/voice/human_male_scream_2.ogg','sound/voice/human_male_scream_3.ogg','sound/voice/human_male_scream_4.ogg','sound/voice/human_male_scream_5.ogg','sound/voice/human_male_scream_6.ogg') | ||
|
@@ -323,4 +324,12 @@ A good representation is: 'byond applies a volume reduction to the sound every X | |
S = pick("sound/voice/human_male_preburst1.ogg", 'sound/voice/human_male_preburst2.ogg', 'sound/voice/human_male_preburst3.ogg') | ||
if("female_preburst") | ||
S = pick("sound/voice/human_female_preburst1.ogg", 'sound/voice/human_female_preburst2.ogg', 'sound/voice/human_female_preburst3.ogg') | ||
|
||
//robot race | ||
if("robot_scream") | ||
S = pick('sound/voice/robot/robot_scream1.ogg', 'sound/voice/robot/robot_scream2.ogg', 'sound/voice/robot/robot_scream2.ogg') | ||
if("robot_pain") | ||
S = pick('sound/voice/robot/robot_pain1.ogg', 'sound/voice/robot/robot_pain2.ogg', 'sound/voice/robot/robot_pain3.ogg') | ||
if("robot_warcry") | ||
S = pick('sound/voice/robot/robot_warcry1.ogg', 'sound/voice/robot/robot_warcry2.ogg', 'sound/voice/robot/robot_warcry3.ogg') | ||
return S |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -665,3 +665,31 @@ obj/item/clothing/head/helmet/marine/pilot/green | |
flags_item = NODROP|DELONDROP | ||
soft_armor = list("melee" = 65, "bullet" = 60, "laser" = 30, "energy" = 20, "bomb" = 25, "bio" = 40, "rad" = 0, "fire" = 20, "acid" = 20) | ||
anti_hug = 5 | ||
|
||
|
||
/obj/item/clothing/head/helmet/marine/robot | ||
name = "XN-1 upper armor plating" | ||
desc = "Medium armor plating designed for self mounting on the upper half of TerraGov combat robotics. It has self-sealing bolts for mounting on robotic owners inside." | ||
icon_state = "robot_helmet_medium" | ||
item_state = "robot_helmet_medium" | ||
species_exception = list(/datum/species/robot) | ||
flags_item_map_variant = (ITEM_JUNGLE_VARIANT|ITEM_ICE_VARIANT|ITEM_PRISON_VARIANT) | ||
soft_armor = list("melee" = 15, "bullet" = 15, "laser" = 15, "energy" = 15, "bomb" = 15, "bio" = 15, "rad" = 15, "fire" = 15, "acid" = 15) | ||
|
||
/obj/item/clothing/head/helmet/marine/robot/mob_can_equip(mob/M, slot, warning, override_nodrop) | ||
. = ..() | ||
if(!isrobot(M)) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. is it worth making this another var on the item, like species_requirement = list(/datum/species/robot) ? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. maybe in future but for now its only 6 items and i dont want to bloat this pr |
||
return FALSE | ||
|
||
/obj/item/clothing/head/helmet/marine/robot/light | ||
name = "XN-1-L upper armor plating" | ||
desc = "Light armor plating designed for self mounting on the upper half of TerraGov combat robotics. It has self-sealing bolts for mounting on robotic owners inside." | ||
icon_state = "robot_helmet_light" | ||
item_state = "robot_helmet_light" | ||
|
||
/obj/item/clothing/head/helmet/marine/robot/heavy | ||
name = "XN-1-H upper armor plating" | ||
desc = "Heavy armor plating designed for self mounting on the upper half of TerraGov combat robotics. It has self-sealing bolts for mounting on robotic owners inside." | ||
icon_state = "robot_helmet_heavy" | ||
item_state = "robot_helmet_heavy" | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Because ishuman check?