shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
LetterJay
2017-06-14 11:16:54 -05:00
parent 5c2acd599e
commit 813bcc2b8d
14 changed files with 150 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/area/areas/shuttles.dm
+20
View File
@@ -59,3 +59,23 @@
/area/shuttle/abandoned
name = "Abandoned Ship"
blob_allowed = FALSE
/area/shuttle/sbc_starfury
name = "SBC Starfury"
blob_allowed = FALSE
/area/shuttle/sbc_fighter1
name = "SBC Fighter 1"
blob_allowed = FALSE
/area/shuttle/sbc_fighter2
name = "SBC Fighter 2"
blob_allowed = FALSE
/area/shuttle/sbc_corvette
name = "SBC corvette"
blob_allowed = FALSE
/area/shuttle/syndicate_scout
name = "Syndicate Scout"
blob_allowed = FALSE
code/game/machinery/porta_turret/portable_turret.dm
+37 -28
View File
@@ -87,9 +87,9 @@
if(has_cover)
cover = new /obj/machinery/porta_turret_cover(loc)
cover.parent_turret = src
var/mutable_appearance/base = mutable_appearance('icons/obj/turrets.dmi', "basedark")
base.layer = NOT_HIGH_OBJ_LAYER
underlays += base
var/mutable_appearance/base = mutable_appearance('icons/obj/turrets.dmi', "basedark")
base.layer = NOT_HIGH_OBJ_LAYER
underlays += base
if(!has_cover)
INVOKE_ASYNC(src, .proc/popUp)
@@ -554,7 +554,7 @@
use_power = 0
has_cover = 0
scan_range = 9
req_access = list(GLOB.access_syndicate)
req_access = list(GLOB.access_syndicate)
stun_projectile = /obj/item/projectile/bullet
lethal_projectile = /obj/item/projectile/bullet
lethal_projectile_sound = 'sound/weapons/Gunshot.ogg'
@@ -564,6 +564,15 @@
faction = "syndicate"
emp_vunerable = 0
/obj/machinery/porta_turret/syndicate/energy
icon_state = "standard_stun"
base_icon_state = "standard"
stun_projectile = /obj/item/projectile/energy/electrode
stun_projectile_sound = 'sound/weapons/Taser.ogg'
lethal_projectile = /obj/item/projectile/beam/laser/heavylaser
lethal_projectile_sound = 'sound/weapons/lasercannonfire.ogg'
/obj/machinery/porta_turret/syndicate/setup()
return
@@ -571,8 +580,8 @@
return 10 //Syndicate turrets shoot everything not in their faction
/obj/machinery/porta_turret/syndicate/pod
max_integrity = 40
integrity_failure = 20
max_integrity = 40
integrity_failure = 20
obj_integrity = 40
stun_projectile = /obj/item/projectile/bullet/weakbullet3
lethal_projectile = /obj/item/projectile/bullet/weakbullet3
@@ -948,7 +957,7 @@
var/atom/target
var/turf/target_turf
var/warned = FALSE
var/mouseparams
var/mouseparams
//BUCKLE HOOKS
@@ -992,8 +1001,8 @@
icon = 'icons/obj/weapons.dmi'
icon_state = "offhand"
w_class = WEIGHT_CLASS_HUGE
flags = ABSTRACT | NODROP | NOBLUDGEON
resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF
flags = ABSTRACT | NODROP | NOBLUDGEON
resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF
var/obj/machinery/manned_turret/turret
/obj/item/gun_control/New(obj/machinery/manned_turret/MT)
@@ -1005,22 +1014,22 @@
/obj/item/gun_control/CanItemAutoclick()
return 1
/obj/item/gun_control/attack_obj(obj/O, mob/living/user)
user.changeNext_move(CLICK_CD_MELEE)
O.attacked_by(src, user)
/obj/item/gun_control/attack(mob/living/M, mob/living/user)
user.lastattacked = M
M.lastattacker = user
M.attacked_by(src, user)
add_fingerprint(user)
/obj/item/gun_control/afterattack(atom/targeted_atom, mob/user, flag, params)
/obj/item/gun_control/attack_obj(obj/O, mob/living/user)
user.changeNext_move(CLICK_CD_MELEE)
O.attacked_by(src, user)
/obj/item/gun_control/attack(mob/living/M, mob/living/user)
user.lastattacked = M
M.lastattacker = user
M.attacked_by(src, user)
add_fingerprint(user)
/obj/item/gun_control/afterattack(atom/targeted_atom, mob/user, flag, params)
..()
var/obj/machinery/manned_turret/E = user.buckled
E.setDir(get_dir(E,targeted_atom))
user.setDir(E.dir)
E.mouseparams = params
E.mouseparams = params
switch(E.dir)
if(NORTH)
E.layer = BELOW_MOB_LAYER
@@ -1068,15 +1077,15 @@
else
cooldown = world.time + cooldown_duration
warned = FALSE
volley(user)
volley(user)
/obj/machinery/manned_turret/proc/volley(mob/user)
/obj/machinery/manned_turret/proc/volley(mob/user)
target_turf = get_turf(target)
for(var/i in 1 to number_of_shots)
addtimer(CALLBACK(src, /obj/machinery/manned_turret/.proc/fire_helper, user), i*rate_of_fire)
addtimer(CALLBACK(src, /obj/machinery/manned_turret/.proc/fire_helper, user), i*rate_of_fire)
/obj/machinery/manned_turret/proc/fire_helper(mob/user)
/obj/machinery/manned_turret/proc/fire_helper(mob/user)
if(!src)
return
var/turf/targets_from = get_turf(src)
@@ -1085,10 +1094,10 @@
var/obj/item/projectile/P = new projectile_type(targets_from)
P.current = targets_from
P.starting = targets_from
P.firer = user
P.firer = user
P.original = target
playsound(src, 'sound/weapons/Gunshot_smg.ogg', 75, 1)
P.preparePixelProjectile(target, target_turf, user, mouseparams, rand(-9, 9))
P.preparePixelProjectile(target, target_turf, user, mouseparams, rand(-9, 9))
P.fire()
/obj/machinery/manned_turret/ultimate // Admin-only proof of concept for autoclicker automatics
@@ -1102,4 +1111,4 @@
if(target == user || target == get_turf(src))
return
target_turf = get_turf(target)
fire_helper(user)
fire_helper(user)
code/game/objects/effects/decals/decal.dm
+4 -1
View File
@@ -64,4 +64,7 @@
icon_state = "sandyfloor"
/obj/effect/turf_decal/sand/plating
icon_state = "sandyplating"
icon_state = "sandyplating"
/obj/effect/turf_decal/plaque
icon_state = "plaque"
code/game/objects/structures/ghost_role_spawners.dm
+49
View File
@@ -371,3 +371,52 @@
back = /obj/item/weapon/storage/backpack
implants = list(/obj/item/weapon/implant/mindshield) //No revolutionaries, he's MY friend.
id = /obj/item/weapon/card/id
/obj/effect/mob_spawn/human/syndicate
name = "Syndicate Operative"
roundstart = FALSE
death = FALSE
icon = 'icons/obj/Cryogenic2.dmi'
icon_state = "sleeper_s"
id_access_list = list(GLOB.access_syndicate)
outfit = /datum/outfit/syndicate_empty
/datum/outfit/syndicate_empty
name = "Syndicate Operative Empty"
uniform = /obj/item/clothing/under/syndicate
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/combat
ears = /obj/item/device/radio/headset/syndicate/alt
back = /obj/item/weapon/storage/backpack
implants = list(/obj/item/weapon/implant/weapons_auth)
id = /obj/item/weapon/card/id
/datum/outfit/syndicate_empty/post_equip(mob/living/carbon/human/H)
H.faction |= "syndicate"
/obj/effect/mob_spawn/human/syndicate/battlecruiser
name = "Syndicate Battlecruiser Ensign"
flavour_text = "<font size=3>You are a syndicate ensign aboard a state of the art weapons platform -- the SBC Starfury. <b>Follow your captain's orders, maintain the ship, and protect both with your life.</b>"
outfit = /datum/outfit/syndicate_empty/SBC
/datum/outfit/syndicate_empty/SBC
name = "Syndicate Battlecruiser Ensign"
belt = /obj/item/weapon/gun/ballistic/automatic/pistol
r_pocket = /obj/item/weapon/kitchen/knife/combat/survival
suit = /obj/item/clothing/suit/armor/vest
/obj/effect/mob_spawn/human/syndicate/battlecruiser/captain
name = "Syndicate Battlecruiser Captain"
flavour_text = "<font size=3>You are a syndicate admiral in command of a state of the art weapons platform -- the SBC Starfury. <b>You are to destroy Nanotrasens' Space Station 13.</b> Do not let the enemy take control of your ship under any circumstances."
outfit = /datum/outfit/syndicate_empty/SBC/captain
id_access_list = list(150,151)
/datum/outfit/syndicate_empty/SBC/captain
name = "Syndicate Battlecruiser Captain"
belt = /obj/item/weapon/gun/ballistic/automatic/pistol
r_pocket = /obj/item/weapon/melee/classic_baton/telescopic
suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate
back = /obj/item/weapon/storage/backpack/satchel/leather
head = /obj/item/clothing/head/HoS/beret/syndicate
mask = /obj/item/clothing/mask/cigarette/cigar/havana
glasses = /obj/item/clothing/glasses/thermal/eyepatch
code/game/shuttle_engines.dm
+19
View File
@@ -36,3 +36,22 @@
/obj/structure/shuttle/engine/router
name = "router"
icon_state = "router"
/obj/structure/shuttle/engine/large
name = "engine"
opacity = 1
icon = 'icons/obj/2x2.dmi'
icon_state = "large_engine"
bound_width = 64
bound_height = 64
appearance_flags = 0
/obj/structure/shuttle/engine/huge
name = "engine"
opacity = 1
icon = 'icons/obj/3x3.dmi'
icon_state = "huge_engine"
bound_width = 96
bound_height = 96
appearance_flags = 0