small tweaks

- fixed creambeasts and chocoslimes fighting
- added a gym to Xenoarch base
- assigned Fanatic Feeders to Syndicate faction, so the turrets don't do friendly fire
- small bits of GATO reflavoring
- ported Spider Legs (wings slot), gator taul tail and alt naga tail sprite from Virgo
This commit is contained in:
evilew
2023-09-27 12:40:01 +02:00
parent 4c26e0c2af
commit 44d3149a46
22 changed files with 199 additions and 160 deletions
+6 -6
View File
@@ -683,8 +683,9 @@
job_description = "Fanatical degenerate"
short_desc = "You are a member of a niche branch of Syndicate with... strange goals."
flavour_text = "After months of construction and gathering equipment, your den is finished - a monument to gluttony, equipped with every tool to turn any sharp body into a quivering mound of lard..."
important_info = "Keep your den in one piece and away from curious eyes! YOU AREN'T ALLOWED TO CAPTURE / FATTEN UP PEOPLE WHO DON'T DO NON-CON OR DIDN'T AGREE TO IT!!"
important_info = "Keep your den in one piece and away from curious eyes! YOU AREN'T ALLOWED TO CAPTURE / FATTEN UP PEOPLE WHO DON'T DO NON-CON OR DIDN'T AGREE TO IT! Despite being able to leave the outpost, you do NOT have a permission to antag or grief."
outfit = /datum/outfit/feeders_den/fanatic
faction = ROLE_SYNDICATE
mirrorcanloadappearance = TRUE
assignedrole = "Space Agent"
icon = 'icons/obj/machines/sleeper.dmi'
@@ -701,11 +702,14 @@
gloves = /obj/item/clothing/gloves/combat
ears = /obj/item/radio/headset/syndicate/alt
back = /obj/item/storage/backpack
r_hand = /obj/item/melee/transforming/energy/sword/saber
r_hand = /obj/item/flashlight
r_pocket = /obj/item/gun/ballistic/automatic/pistol
id = /obj/item/card/id/syndicate/anyone
implants = list(/obj/item/implant/weapons_auth)
/datum/outfit/feeders_den/fanatic/post_equip(mob/living/carbon/human/H)
H.faction |= ROLE_SYNDICATE
/datum/outfit/feeders_den/fanatic/Destroy()
new/obj/structure/fluff/empty_sleeper/syndicate(get_turf(src))
..()
@@ -742,10 +746,6 @@
new/obj/structure/fluff/empty_sleeper/syndicate(get_turf(src))
..()
/obj/effect/mob_spawn/human/feeders_den/victim/startfat(mob/living/carbon/human/new_spawn)
new_spawn.fatness = 300
return ..()
/obj/effect/mob_spawn/human/feeders_den/victim/special(mob/living/carbon/human/new_spawn)
ADD_TRAIT(new_spawn,TRAIT_EXEMPT_HEALTH_EVENTS,GHOSTROLE_TRAIT)
@@ -597,7 +597,7 @@
faction = ROLE_SYNDICATE
outfit = /datum/outfit/snowsyndie
short_desc = "You are a syndicate operative recently awoken from cryostasis in an underground outpost."
flavour_text = "You are a syndicate operative recently awoken from cryostasis in an underground outpost. Monitor Nanotrasen communications and record information. All intruders should be \
flavour_text = "You are a syndicate operative recently awoken from cryostasis in an underground outpost. Monitor GATO communications and record information. All intruders should be \
disposed of swiftly to assure no gathered information is stolen or lost. Try not to wander too far from the outpost as the caves can be a deadly place even for a trained operative such as yourself."
/datum/outfit/snowsyndie
+2 -2
View File
@@ -10,7 +10,7 @@
var/reason = pick(
"The station is passing through a debris cloud, expect minor damage \
to external fittings and fixtures.",
"Nanotrasen Superweapons Division is testing a new prototype \
"GATO Superweapons Division is testing a new prototype \
[pick("field","projection","nova","super-colliding","reactive")] \
[pick("cannon","artillery","tank","cruiser","\[REDACTED\]")], \
some mild debris is expected.",
@@ -25,4 +25,4 @@
var/obj/item/paper/P = new(C.loc)
P.name = "Collision Alert"
P.info = "[pick(reason)]"
P.update_icon()
P.update_icon()
@@ -71,7 +71,6 @@
/datum/sprite_accessory/deco_wings/punished
name = "Burnt Off"
icon_state = "punished"
locked = TRUE
/datum/sprite_accessory/deco_wings/firewatch
name = "Firewatch"
@@ -123,4 +122,9 @@
/datum/sprite_accessory/deco_wings/none
name = "None"
icon_state = "none"
icon_state = "none"
//virgo port
/datum/sprite_accessory/deco_wings/spider_legs //Not really /WINGS/ but they protrude from the back, kinda. Might as well have them here.
name = "Spider"
icon_state = "spider"
+1 -1
View File
@@ -53,7 +53,7 @@
/datum/techweb/science //Global science techweb for RND consoles.
id = "SCIENCE"
organization = "Nanotrasen"
organization = "GATO"
/datum/techweb/Destroy()
researched_nodes = null
+2 -2
View File
@@ -118,7 +118,7 @@
icon = 'icons/obj/machines/sleeper.dmi'
icon_state = "sleeper_s"
short_desc = "You are a syndicate agent, employed in a top secret research facility developing biological weapons plants and toys."
flavour_text = "Fortunately, Nanotrasen's activity in this sector of space is minimal. Continue your research as best you can, and try to keep a low profile from both Nanotrasen and GATO."
flavour_text = "Fortunately, GATO's activity in this sector of space is minimal. Continue your research as best you can, and try to keep a low profile from both Nanotrasen and GATO."
important_info = "The base is rigged with explosives, DO NOT leave the base or let it fall into enemy hands!" //Changed 'abandon it' to 'leave the base', no more loopholes please, you know who you are.
outfit = /datum/outfit/lavaland_syndicate
assignedrole = "Lavaland Syndicate"
@@ -148,7 +148,7 @@
name = "Syndicate Comms Agent"
job_description = "Off-station Syndicate Comms Agent"
short_desc = "You are a syndicate comms agent, employed in a top secret research facility developing biological weapons."
flavour_text = "Fortunately, Nanotrasen's activity in this sector of space is minimal. Monitor enemy activity as best you can, and try to keep a low profile. Use the communication equipment to provide support to any field agents, and sow disinformation to throw Nanotrasen or GATO off your trail. Do not let the base fall into enemy hands!"
flavour_text = "Fortunately, GATO's activity in this sector of space is minimal. Monitor enemy activity as best you can, and try to keep a low profile. Use the communication equipment to provide support to any field agents, and sow disinformation to throw Nanotrasen or GATO off your trail. Do not let the base fall into enemy hands!"
important_info = "The base is rigged with explosives, DO NOT leave the base or let it fall into enemy hands!" //Changed 'abandon it' to 'leave the base', no more loopholes please, you know who you are.
outfit = /datum/outfit/lavaland_syndicate/comms
mirrorcanloadappearance = TRUE