cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-25 05:51:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tweaks some stuff to better reflect synth lore (#6905)

Browse Source 
At request of kyres
-removes hunter seeker borgs
-removes the synthetic intelligence movement armband
-give the unique robotic tools to the borgs, so their cool sprites will not go unused
This commit is contained in:
Alberyk
2019-08-27 17:55:15 +03:00
committed by Erki
parent 7b6a759361
commit a2feca5051
5 changed files with 36 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_accessories.dm
-1
View File
@@ -35,7 +35,6 @@
armbands["engineering armband"] = /obj/item/clothing/accessory/armband/engine
armbands["hydroponics armband"] = /obj/item/clothing/accessory/armband/hydro
armbands["science armband"] = /obj/item/clothing/accessory/armband/science
armbands["synthetic intelligence movement armband"] = /obj/item/clothing/accessory/armband/movement
armbands["ATLAS armband"] = /obj/item/clothing/accessory/armband/atlas
armbands["IAC armband"] = /obj/item/clothing/accessory/armband/iac
gear_tweaks += new/datum/gear_tweak/path(armbands)
code/modules/clothing/under/accessories/armband.dm
-5
View File
@@ -34,11 +34,6 @@
desc = "An armband, worn by the crew to display which department they're assigned to. This one is white and green."
icon_state = "medgreen"
/obj/item/clothing/accessory/armband/movement //cakeisossim armband
name = "synthetic intelligence movement armband"
desc = "An armband, signifying membership of the Synthetic Intelligence Movement. It's white, with a brown stripe that appears to look like an active positronic brain."
icon_state = "movement"
/obj/item/clothing/accessory/armband/atlas
name = "atlas armband"
desc = "This is a armband showing anyone who sees this person, as a member of the political party Atlas. This one is black."
code/modules/mob/living/silicon/robot/presets.dm
-55
View File
@@ -21,61 +21,6 @@
scrambledcodes = 1
lawupdate = 0
/mob/living/silicon/robot/hunter_seeker //added for events, at the request of the lore people
maxHealth = 300
health = 300
scrambledcodes = 1
lawupdate = 0
cell_type = /obj/item/weapon/cell/super
overclocked = 1
speed = -3
req_access = list(access_syndicate)
idcard_type = /obj/item/weapon/card/id/syndicate
key_type = /obj/item/device/encryptionkey/syndicate
spawn_module = /obj/item/weapon/robot_module/hunter_seeker
no_pda = TRUE
light_color = LIGHT_COLOR_EMERGENCY
light_power = 15
light_range = 15
integrated_light_power = 15
light_wedge = 10
/mob/living/silicon/robot/hunter_seeker/init()
..()
if(!jetpack)
jetpack = new /obj/item/weapon/tank/jetpack/carbondioxide/synthetic(src)
var/obj/item/robot_parts/robot_component/surge/S = new(src)
for(var/V in components)
var/datum/robot_component/C = components[V]
if(!C.installed && istype(S, C.external_type))
C.wrapped = S
C.install()
S.loc = null
/mob/living/silicon/robot/hunter_seeker/updateicon() //because this was the only way I found out how to make their eyes and etc works
cut_overlays()
if(stat == 0)
add_overlay("eyes-[icon_state]")
if(opened)
var/panelprefix = custom_sprite ? src.ckey : "ov"
if(wiresexposed)
add_overlay("[panelprefix]-openpanel +w")
else if(cell)
add_overlay("[panelprefix]-openpanel +c")
else
add_overlay("[panelprefix]-openpanel -c")
if(module_active && istype(module_active,/obj/item/borg/combat/shield))
add_overlay("[icon_state]-shield")
if(modtype == "Combat")
if(module_active && istype(module_active,/obj/item/borg/combat/mobility))
icon_state = "[icon_state]-roll"
else
icon_state = module_sprites[icontype]
/mob/living/silicon/robot/bluespace
modtype = "Bluespace"
spawn_module = /obj/item/weapon/robot_module/bluespace
code/modules/mob/living/silicon/robot/robot_modules.dm
+30 -73
View File
@@ -207,7 +207,7 @@ var/global/list/robot_modules = list(
/obj/item/weapon/robot_module/medical/general/New()
..()
src.modules += new /obj/item/weapon/crowbar(src)
src.modules += new /obj/item/weapon/crowbar/robotic(src)
src.modules += new /obj/item/device/flash(src)
src.modules += new /obj/item/borg/sight/hud/med(src)
src.modules += new /obj/item/device/healthanalyzer(src)
@@ -281,7 +281,7 @@ var/global/list/robot_modules = list(
src.modules += new /obj/item/device/healthanalyzer(src)
src.modules += new /obj/item/device/reagent_scanner/adv(src)
src.modules += new /obj/item/device/breath_analyzer(src)
src.modules += new /obj/item/weapon/crowbar(src)
src.modules += new /obj/item/weapon/crowbar/robotic(src)
src.modules += new /obj/item/roller_holder(src)
src.modules += new /obj/item/weapon/reagent_containers/borghypo/rescue(src)
src.modules += new /obj/item/weapon/reagent_containers/dropper/industrial(src)
@@ -359,9 +359,9 @@ var/global/list/robot_modules = list(
src.modules += new /obj/item/borg/sight/meson(src)
src.modules += new /obj/item/weapon/extinguisher(src)
src.modules += new /obj/item/weapon/rcd/borg(src)
src.modules += new /obj/item/weapon/screwdriver(src)
src.modules += new /obj/item/weapon/wrench(src)
src.modules += new /obj/item/weapon/crowbar(src)
src.modules += new /obj/item/weapon/screwdriver/robotic(src)
src.modules += new /obj/item/weapon/wrench/robotic(src)
src.modules += new /obj/item/weapon/crowbar/robotic(src)
src.modules += new /obj/item/weapon/weldingtool/experimental(src)
src.modules += new /obj/item/device/pipe_painter(src)
src.modules += new /obj/item/weapon/gripper/no_use/loader(src)
@@ -414,11 +414,11 @@ var/global/list/robot_modules = list(
src.modules += new /obj/item/borg/sight/meson(src)
src.modules += new /obj/item/weapon/extinguisher(src)
src.modules += new /obj/item/weapon/weldingtool/largetank(src)
src.modules += new /obj/item/weapon/screwdriver(src)
src.modules += new /obj/item/weapon/wrench(src)
src.modules += new /obj/item/weapon/crowbar(src)
src.modules += new /obj/item/weapon/wirecutters(src)
src.modules += new /obj/item/device/multitool(src)
src.modules += new /obj/item/weapon/screwdriver/robotic(src)
src.modules += new /obj/item/weapon/wrench/robotic(src)
src.modules += new /obj/item/weapon/crowbar/robotic(src)
src.modules += new /obj/item/weapon/wirecutters/robotic(src)
src.modules += new /obj/item/device/multitool/robotic(src)
src.modules += new /obj/item/device/t_scanner(src)
src.modules += new /obj/item/device/analyzer(src)
src.modules += new /obj/item/taperoll/engineering(src)
@@ -516,7 +516,7 @@ var/global/list/robot_modules = list(
/obj/item/weapon/robot_module/janitor/New()
..()
src.modules += new /obj/item/weapon/crowbar(src)
src.modules += new /obj/item/weapon/crowbar/robotic(src)
src.modules += new /obj/item/device/flash(src)
src.modules += new /obj/item/weapon/soap/nanotrasen(src)
src.modules += new /obj/item/weapon/storage/bag/trash(src)
@@ -575,7 +575,7 @@ var/global/list/robot_modules = list(
/obj/item/weapon/robot_module/clerical/butler/New()
..()
src.modules += new /obj/item/weapon/crowbar(src)
src.modules += new /obj/item/weapon/crowbar/robotic(src)
src.modules += new /obj/item/device/flash(src)
src.modules += new /obj/item/weapon/gripper/service(src)
src.modules += new /obj/item/weapon/reagent_containers/glass/bucket(src)
@@ -614,7 +614,7 @@ var/global/list/robot_modules = list(
/obj/item/weapon/robot_module/clerical/general/New()
..()
src.modules += new /obj/item/weapon/crowbar(src)
src.modules += new /obj/item/weapon/crowbar/robotic(src)
src.modules += new /obj/item/device/flash(src)
src.modules += new /obj/item/weapon/pen/robopen(src)
src.modules += new /obj/item/weapon/form_printer(src)
@@ -651,11 +651,11 @@ var/global/list/robot_modules = list(
/obj/item/weapon/robot_module/miner/New()
..()
src.modules += new /obj/item/weapon/crowbar(src)
src.modules += new /obj/item/weapon/crowbar/robotic(src)
src.modules += new /obj/item/device/flash(src)
src.modules += new /obj/item/borg/sight/material(src)
src.modules += new /obj/item/weapon/wrench(src)
src.modules += new /obj/item/weapon/screwdriver(src)
src.modules += new /obj/item/weapon/wrench/robotic(src)
src.modules += new /obj/item/weapon/screwdriver/robotic(src)
src.modules += new /obj/item/weapon/storage/bag/ore(src)
src.modules += new /obj/item/weapon/pickaxe/borgdrill(src)
src.modules += new /obj/item/weapon/storage/bag/sheetsnatcher/borg(src)
@@ -685,9 +685,9 @@ var/global/list/robot_modules = list(
src.modules += new /obj/item/weapon/gripper/no_use/loader(src)
src.modules += new /obj/item/device/robotanalyzer(src)
src.modules += new /obj/item/weapon/card/robot(src)
src.modules += new /obj/item/weapon/wrench(src)
src.modules += new /obj/item/weapon/wrench/robotic(src)
src.modules += new /obj/item/weapon/screwdriver(src)
src.modules += new /obj/item/weapon/crowbar(src)
src.modules += new /obj/item/weapon/crowbar/robotic(src)
src.modules += new /obj/item/weapon/scalpel(src)
src.modules += new /obj/item/weapon/circular_saw(src)
src.modules += new /obj/item/weapon/extinguisher/mini(src)
@@ -744,7 +744,7 @@ var/global/list/robot_modules = list(
src.modules += new /obj/item/weapon/gun/energy/mountedsmg(src)
src.modules += new /obj/item/weapon/gun/energy/net/mounted(src)
src.modules += new /obj/item/weapon/gun/launcher/grenade/cyborg(src)
src.modules += new /obj/item/weapon/crowbar(src)
src.modules += new /obj/item/weapon/crowbar/robotic(src)
src.modules += new /obj/item/weapon/robot_emag(src)
src.modules += new /obj/item/weapon/handcuffs/cyborg(src)
supported_upgrades = list(/obj/item/robot_parts/robot_component/jetpack)
@@ -769,7 +769,7 @@ var/global/list/robot_modules = list(
src.modules += new /obj/item/borg/combat/shield(src)
src.modules += new /obj/item/borg/combat/mobility(src)
src.modules += new /obj/item/weapon/handcuffs/cyborg(src)
src.modules += new /obj/item/weapon/crowbar(src)
src.modules += new /obj/item/weapon/crowbar/robotic(src)
src.emag = new /obj/item/weapon/gun/energy/lasercannon/mounted(src)
/obj/item/weapon/robot_module/drone
@@ -780,11 +780,11 @@ var/global/list/robot_modules = list(
/obj/item/weapon/robot_module/drone/New(var/mob/living/silicon/robot/robot)
..()
src.modules += new /obj/item/weapon/weldingtool(src)
src.modules += new /obj/item/weapon/screwdriver(src)
src.modules += new /obj/item/weapon/wrench(src)
src.modules += new /obj/item/weapon/crowbar(src)
src.modules += new /obj/item/weapon/wirecutters(src)
src.modules += new /obj/item/device/multitool(src)
src.modules += new /obj/item/weapon/screwdriver/robotic(src)
src.modules += new /obj/item/weapon/wrench/robotic(src)
src.modules += new /obj/item/weapon/crowbar/robotic(src)
src.modules += new /obj/item/weapon/wirecutters/robotic(src)
src.modules += new /obj/item/device/multitool/robotic(src)
src.modules += new /obj/item/device/lightreplacer(src)
src.modules += new /obj/item/weapon/gripper(src)
src.modules += new /obj/item/weapon/soap(src)
@@ -930,49 +930,6 @@ var/global/list/robot_modules = list(
src.emag.name = "Mounted Plasma Cutter"
..()
/obj/item/weapon/robot_module/hunter_seeker
name = "hunter seeker robot module"
languages = list(
LANGUAGE_SOL_COMMON = 1,
LANGUAGE_TRADEBAND = 1,
LANGUAGE_UNATHI = 1,
LANGUAGE_SIIK_MAAS = 1,
LANGUAGE_SKRELLIAN = 1,
LANGUAGE_GUTTER = 1,
LANGUAGE_VAURCESE = 0,
LANGUAGE_ROOTSONG = 1,
LANGUAGE_SIGN = 0,
LANGUAGE_SIGN_TAJARA = 0,
LANGUAGE_SIIK_TAJR = 0,
LANGUAGE_AZAZIBA = 0,
LANGUAGE_DELVAHII = 0,
LANGUAGE_YA_SSA = 0,
LANGUAGE_TERMINATOR = 1
)
sprites = list(
"Hunter Seeker" = "hunter_seeker"
)
/obj/item/weapon/robot_module/hunter_seeker/New(var/mob/living/silicon/robot/R)
..()
loc = R
src.modules += new /obj/item/device/flash(src)
src.modules += new /obj/item/weapon/pickaxe/borgdrill(src)
src.modules += new /obj/item/borg/sight/thermal(src)
src.modules += new /obj/item/weapon/gun/energy/net/mounted(src)
src.modules += new /obj/item/weapon/gun/energy/mountedcannon(src)
src.modules += new /obj/item/weapon/melee/energy/glaive(src)
src.modules += new /obj/item/weapon/crowbar/robotic(src)
src.modules += new /obj/item/weapon/wrench/robotic(src)
src.modules += new /obj/item/weapon/screwdriver/robotic(src)
src.modules += new /obj/item/device/multitool/robotic(src)
src.modules += new /obj/item/weapon/wirecutters/robotic(src)
src.modules += new /obj/item/weapon/weldingtool/robotic(src)
supported_upgrades = list(/obj/item/robot_parts/robot_component/jetpack)
return
/obj/item/weapon/robot_module/bluespace
name = "bluespace robot module"
languages = list(
@@ -1026,11 +983,11 @@ var/global/list/robot_modules = list(
src.modules += new /obj/item/weapon/rcd/borg/infinite(src)
src.modules += new /obj/item/weapon/extinguisher(src)
src.modules += new /obj/item/weapon/weldingtool/largetank(src)
src.modules += new /obj/item/weapon/screwdriver(src)
src.modules += new /obj/item/weapon/wrench(src)
src.modules += new /obj/item/weapon/crowbar(src)
src.modules += new /obj/item/weapon/wirecutters(src)
src.modules += new /obj/item/device/multitool(src)
src.modules += new /obj/item/weapon/screwdriver/robotic(src)
src.modules += new /obj/item/weapon/wrench/robotic(src)
src.modules += new /obj/item/weapon/crowbar/robotic(src)
src.modules += new /obj/item/weapon/wirecutters/robotic(src)
src.modules += new /obj/item/device/multitool/robotic(src)
src.modules += new /obj/item/device/t_scanner(src)
src.modules += new /obj/item/device/analyzer(src)
src.modules += new /obj/item/weapon/gripper(src)
html/changelogs/alberyk-synthlore.yml
+6
View File
@@ -0,0 +1,6 @@
author: Alberyk
delete-after: True
changes:
- rscdel: "Removed the synthetic intelligence movement armband."