103 code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
View file

This file was deleted.

2 code/modules/mob/living/carbon/alien/larva/powers.dm
View file
@@ -38,7 +38,7 @@
if(L.amount_grown >= L.max_grown) //TODO ~Carn //wut?
L << "<span class='name'>You are growing into a beautiful alien! It is time to choose a caste.</span>"
L << "<span class='info'>There are three to choose from:"
L << "<span class='name'>Hunters</span> <span class='info'>are the most agile caste tasked with hunting for hosts. They are faster than a human and can even pounce, but are not much tougher than a drone.</span>"
L << "<span class='name'>Warriors</span> <span class='info'>are the most agile caste tasked with hunting for hosts. They are faster than a human and can even pounce, but are not much tougher than a drone.</span>"
L << "<span class='name'>Sentinels</span> <span class='info'>are tasked with protecting the hive. With their ranged spit, invisibility, and high health, they make formidable guardians and acceptable secondhand hunters.</span>"
L << "<span class='name'>Drones</span> <span class='info'>are the weakest and slowest of the castes, but can grow into the queen if there is none, and are vital to maintaining a hive with their resin secretion abilities.</span>"
var/alien_caste = alert(L, "Please choose which alien caste you shall belong to.",,"Warrior","Sentinel","Drone")
2 code/modules/mob/living/carbon/alien/organs.dm
View file
@@ -99,8 +99,6 @@
/obj/item/organ/alien/plasmavessel/on_life()
if(!owner)
return
if(!isalien(owner))
return
var/mob/living/carbon/alien/A = owner
if("recovery" in A.active_pheromones)
affected_by_pheromone = TRUE
11 code/modules/mob/living/silicon/pai/pai.dm
View file
@@ -48,6 +48,7 @@
var/hackprogress = 0 // Possible values: 0 - 100, >= 100 means the hack is complete and will be reset upon next check

var/obj/item/radio/integrated/signal/sradio // AI's signaller
var/obj/machinery/porta_turret/syndicate/marine/turret //Turret controlled by the pAI


/mob/living/silicon/pai/New(var/obj/item/device/paicard/P)
@@ -165,3 +166,13 @@
card.setPersonality(pai)
*/
/mob/living/silicon/pai/ClickOn(atom/A, params)
..()
world << "Click:Called"
if(turret)//we're controlling a turret,let's shoot towards our target
world << "Turret found"
if(A && !turret.manual_override)
world << "Check passed"
if(turret.shootAt(A))
world << "Bullet created"
return
24 code/modules/mob/living/silicon/pai/software.dm
View file
@@ -41,31 +41,31 @@
if("main")
left_part = ""
if("directives")
left_part = src.directives()
left_part = directives()
if("pdamessage")
left_part = src.pdamessage()
left_part = pdamessage()
if("buy")
left_part = downloadSoftware()
if("manifest")
left_part = src.softwareManifest()
left_part = softwareManifest()
if("medicalrecord")
left_part = src.softwareMedicalRecord()
left_part = softwareMedicalRecord()
if("securityrecord")
left_part = src.softwareSecurityRecord()
left_part = softwareSecurityRecord()
if("translator")
left_part = src.softwareTranslator()
left_part = softwareTranslator()
if("atmosensor")
left_part = src.softwareAtmo()
left_part = softwareAtmo()
if("securityhud")
left_part = src.facialRecognition()
left_part = facialRecognition()
if("medicalhud")
left_part = src.medicalAnalysis()
left_part = medicalAnalysis()
if("doorjack")
left_part = src.softwareDoor()
left_part = softwareDoor()
if("camerajack")
left_part = src.softwareCamera()
left_part = softwareCamera()
if("signaller")
left_part = src.softwareSignal()
left_part = softwareSignal()

//usr << browse_rsc('windowbak.png') // This has been moved to the mob's Login() proc

2 code/modules/mob/living/simple_animal/guardian/types/charger.dm
View file
@@ -8,7 +8,7 @@
speed = -1
damage_coeff = list(BRUTE = 0.6, BURN = 0.6, TOX = 0.6, CLONE = 0.6, STAMINA = 0, OXY = 0.6)
playstyle_string = "<span class='holoparasite'>As a <b>charger</b> type you do medium damage, have medium damage resistance, move very fast, and can charge at a location, damaging any target hit and forcing them to drop any items they are holding.</span>"
magic_fluff_string = "<span class='holoparasite'>..And draw the Hunter, an alien master of rapid assault.</span>"
magic_fluff_string = "<span class='holoparasite'>..And draw the Warrior, an alien master of rapid assault.</span>"
tech_fluff_string = "<span class='holoparasite'>Boot sequence complete. Charge modules loaded. Holoparasite swarm online.</span>"
carp_fluff_string = "<span class='holoparasite'>CARP CARP CARP! Caught one! It's a charger carp, that likes running at people. But it doesn't have any legs...</span>"
var/charging = 0
2 code/modules/mob/living/simple_animal/hostile/alien.dm
View file
@@ -1,5 +1,5 @@
/mob/living/simple_animal/hostile/alien
name = "alien hunter"
name = "alien warrior"
desc = "Hiss!"
icon = 'icons/mob/alien.dmi'
icon_state = "alienh_s"
14 code/modules/mob/transform_procs.dm
View file
@@ -373,15 +373,23 @@
for(var/t in bodyparts)
qdel(t)

var/alien_caste = pick("Hunter","Sentinel","Drone")
var/alien_caste = pick("Warrior","Sentinel","Drone","Corroder","Ravager","Crusher","Praetorian")
var/mob/living/carbon/alien/humanoid/new_xeno
switch(alien_caste)
if("Hunter")
new_xeno = new /mob/living/carbon/alien/humanoid/hunter(loc)
if("Warrior")
new_xeno = new /mob/living/carbon/alien/humanoid/warrior(loc)
if("Sentinel")
new_xeno = new /mob/living/carbon/alien/humanoid/sentinel(loc)
if("Drone")
new_xeno = new /mob/living/carbon/alien/humanoid/drone(loc)
if("Corroder")
new_xeno = new /mob/living/carbon/alien/humanoid/big/corroder(loc)
if("Ravager")
new_xeno = new /mob/living/carbon/alien/humanoid/big/ravager(loc)
if("Crusher")
new_xeno = new /mob/living/carbon/alien/humanoid/big/crusher(loc)
if("Praetorian")
new_xeno = new /mob/living/carbon/alien/humanoid/big/praetorian(loc)

new_xeno.a_intent = "harm"
new_xeno.key = key
2 code/modules/projectiles/projectile/magic.dm
View file
@@ -204,7 +204,7 @@
new_mob = new /mob/living/simple_animal/slime/random(M.loc)
if("xeno")
if(prob(50))
new_mob = new /mob/living/carbon/alien/humanoid/hunter(M.loc)
new_mob = new /mob/living/carbon/alien/humanoid/warrior(M.loc)
else
new_mob = new /mob/living/carbon/alien/humanoid/sentinel(M.loc)

6 config/admins.txt
View file
@@ -8,8 +8,4 @@
# NOTE: syntax was changed to allow hyphenation of ranknames, since spaces are stripped. #
###############################################################################################
Carbonhell = Host
Danhibiki = Host
DinduStuffin = Host
TortelliniTony = Host
Dudeinyourbackyard = Host
Spacedong = Host
Shamzie = Host
12 config/config.txt
View file
@@ -1,14 +1,14 @@
## Server name: This appears at the top of the screen in-game. Remove the # infront of SERVERNAME and replace 'tgstation' with the name of your choice
# SERVERNAME tgstation
# SERVERNAME Aliens: Colonial Marines

## Station name: The name of the station as it is referred to in-game. If commented out, the game will generate a random name instead.
STATIONNAME Space Station 13

# Lobby time: This is the amount of time between rounds that players have to setup their characters and be ready.
LOBBY_COUNTDOWN 120
LOBBY_COUNTDOWN 150

# Round End Time: This is the amount of time after the round ends that players have to murder death kill each other.
ROUND_END_COUNTDOWN 90
ROUND_END_COUNTDOWN 30

## Add a # infront of this if you want to use the SQL based admin system, the legacy system uses admins.txt. You need to set up your database to use the SQL based system.
ADMIN_LEGACY_SYSTEM
@@ -63,10 +63,10 @@ LOG_PRAYER
LOG_LAW

## log all Topic() calls (for use by coders in tracking down Topic issues)
# LOG_HREFS
LOG_HREFS

## log all world.Topic() calls
# LOG_WORLD_TOPIC
LOG_WORLD_TOPIC

## disconnect players who did nothing during 10 minutes
# KICK_INACTIVE
@@ -102,7 +102,7 @@ NORESPAWN
# DONT_DEL_NEWMOB

## set a hosted by name for unix platforms
HOSTEDBY Yournamehere
HOSTEDBY Carbonhell

## Set to jobban "Guest-" accounts from Captain, HoS, HoP, CE, RD, CMO, Warden, Security, Detective, and AI positions.
## Set to 1 to jobban them from those positions, set to 0 to allow them.
55 config/game_options.txt
View file
@@ -58,12 +58,12 @@ ANIMAL_DELAY 0


### ALERT LEVELS ###
ALERT_GREEN All threats to the station have passed. Security may not have weapons visible, privacy laws are once again fully enforced.
ALERT_BLUE_UPTO The station has received reliable information about possible hostile activity on the station. Security staff may have weapons visible, random searches are permitted.
ALERT_BLUE_DOWNTO The immediate threat has passed. Security may no longer have weapons drawn at all times, but may continue to have them visible. Random searches are still allowed.
ALERT_RED_UPTO There is an immediate serious threat to the station. Security may have weapons unholstered at all times. Random searches are allowed and advised.
ALERT_RED_DOWNTO The station's destruction has been averted. There is still however an immediate serious threat to the station. Security may have weapons unholstered at all times, random searches are allowed and advised.
ALERT_DELTA Destruction of the station is imminent. All crew are instructed to obey all instructions given by heads of staff. Any violations of these orders can be punished by death. This is not a drill.
ALERT_GREEN All threats to the ship have passed. Non-marine personnel may not have weapons visible, normal laws are once again fully enforced.
ALERT_BLUE_UPTO The ship has received reliable information about possible hostile activity on the distress signal. Marine personnel may have weapons visible.
ALERT_BLUE_DOWNTO The immediate threat has passed. Marines have to return on the ship for debriefing.
ALERT_RED_UPTO There is an immediate serious threat to the ship. All personnel may have weapons unholstered at all times.
ALERT_RED_DOWNTO The ship's destruction has been averted. There is still however an immediate serious threat. All personnel may have weapons unholstered at all times.
ALERT_DELTA Destruction of the ship is imminent. All crew are instructed to obey all instructions given by the command staff. Any violations of these orders can and will be punished by death. This is not a drill.



@@ -76,25 +76,26 @@ ALERT_DELTA Destruction of the station is imminent. All crew are instructed to o
## Default probablity is 1, increase to make that mode more likely to be picked.
## Set to 0 to disable that mode.

PROBABILITY TRAITOR 5
PROBABILITY TRAITORCHAN 4
PROBABILITY DOUBLE_AGENTS 3
PROBABILITY KING_DISK 4
PROBABILITY NUCLEAR 2
PROBABILITY REVOLUTION 2
PROBABILITY SHADOWLING 2
PROBABILITY GANG 2
PROBABILITY CULT 2
PROBABILITY CHANGELING 2
PROBABILITY WIZARD 4
PROBABILITY MALFUNCTION 1
PROBABILITY BLOB 2
PROBABILITY RAGINMAGES 2
PROBABILITY TRAITOR 0
PROBABILITY TRAITORCHAN 0
PROBABILITY DOUBLE_AGENTS 0
PROBABILITY KING_DISK 0
PROBABILITY NUCLEAR 0
PROBABILITY REVOLUTION 0
PROBABILITY SHADOWLING 0
PROBABILITY GANG 0
PROBABILITY CULT 0
PROBABILITY CHANGELING 0
PROBABILITY WIZARD 0
PROBABILITY MALFUNCTION 0
PROBABILITY BLOB 0
PROBABILITY RAGINMAGES 0
PROBABILITY MONKEY 0
PROBABILITY METEOR 0
PROBABILITY EXTENDED 0
PROBABILITY DEVIL 0
PROBABILITY DEVIL_AGENTS 0
PROBABILITY COLONIAL_MARINES 1

## You probably want to keep sandbox off by default for secret and random.
PROBABILITY SANDBOX 0
@@ -174,7 +175,7 @@ TRAITOR_OBJECTIVES_AMOUNT 2
ENFORCE_HUMAN_AUTHORITY

## If late-joining players have a chance to become a traitor/changeling
ALLOW_LATEJOIN_ANTAGONISTS
#ALLOW_LATEJOIN_ANTAGONISTS

## Uncomment to allow players to see the set odds of different rounds in secret/random in the get server revision screen. This will NOT tell the current roundtype.
#SHOW_GAME_TYPE_ODDS
@@ -278,11 +279,11 @@ JOIN_WITH_MUTANT_RACE
ROUNDSTART_RACES human

## Races that are strictly worse than humans that could probably be turned on without balance concerns
ROUNDSTART_RACES lizard
ROUNDSTART_RACES moth
ROUNDSTART_RACES ipc
ROUNDSTART_RACES avian
ROUNDSTART_RACES tarajan
#ROUNDSTART_RACES lizard
#ROUNDSTART_RACES moth
#ROUNDSTART_RACES ipc
#ROUNDSTART_RACES avian
#ROUNDSTART_RACES tarajan
#ROUNDSTART_RACES fly
#ROUNDSTART_RACES plasmaman
#ROUNDSTART_RACES shadow
@@ -361,4 +362,4 @@ BOMBCAP 20
# a less lootfilled or smaller or less round effecting ruin costs less to
# spawn, while the converse is true. Alter this number to affect the amount
# of ruins.
LAVALAND_BUDGET 60
LAVALAND_BUDGET 0
BIN +154 KB (1400%) icons/misc/beach.dmi
View file
Binary file not shown.
BIN +13.9 KB (120%) icons/mob/actions.dmi
View file
Binary file not shown.
BIN -1.72 KB (98%) icons/mob/alien.dmi
View file
Binary file not shown.
BIN +2.38 KB (260%) icons/mob/alienleap.dmi
View file
Binary file not shown.
BIN +3.04 KB (110%) icons/obj/turrets.dmi
View file
Binary file not shown.
2 tgstation.dme
View file
@@ -436,6 +436,7 @@
#include "code\game\machinery\lightswitch.dm"
#include "code\game\machinery\machinery.dm"
#include "code\game\machinery\magnet.dm"
#include "code\game\machinery\marineturret.dm"
#include "code\game\machinery\mass_driver.dm"
#include "code\game\machinery\navbeacon.dm"
#include "code\game\machinery\newscaster.dm"
@@ -1362,7 +1363,6 @@
#include "code\modules\mob\living\carbon\alien\humanoid\caste\corroder.dm"
#include "code\modules\mob\living\carbon\alien\humanoid\caste\crusher.dm"
#include "code\modules\mob\living\carbon\alien\humanoid\caste\drone.dm"
#include "code\modules\mob\living\carbon\alien\humanoid\caste\hunter.dm"
#include "code\modules\mob\living\carbon\alien\humanoid\caste\praetorian.dm"
#include "code\modules\mob\living\carbon\alien\humanoid\caste\ravager.dm"
#include "code\modules\mob\living\carbon\alien\humanoid\caste\sentinel.dm"