cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-29 08:09:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cynosure_map

Browse Source
This commit is contained in:
atermonera
2022-02-12 15:14:31 -08:00
parent d3ef2db8b4 ae7b190b0d
commit e6e434ad0b
105 changed files with 431 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/alien/aliens.dm
+11 -10
View File
@@ -19,8 +19,8 @@
* Resin
*/
/obj/effect/alien/resin
name = "resin"
desc = "Looks like some kind of slimy growth."
name = "magmellite coating"
desc = "Looks like some kind of crystaline growth."
icon_state = "resin"
density = 1
@@ -31,13 +31,13 @@
//var/mob/living/affecting = null
/obj/effect/alien/resin/wall
name = "resin wall"
desc = "Purple slime solidified into a wall."
name = "magmellite wall"
desc = "Matter reformed into a crystaline wall."
icon_state = "resinwall" //same as resin, but consistency ho!
/obj/effect/alien/resin/membrane
name = "resin membrane"
desc = "Purple slime just thin enough to let light pass through."
name = "magmellite pane"
desc = "Purple crystal just thin enough to let light pass through."
icon_state = "resinmembrane"
opacity = 0
health = 120
@@ -55,6 +55,7 @@
/obj/effect/alien/resin/proc/healthcheck()
if(health <=0)
density = 0
playsound(src, 'sound/effects/hit_on_shattered_glass.ogg', 100, 1)
qdel(src)
return
@@ -66,7 +67,7 @@
/obj/effect/alien/resin/attack_generic(var/mob/user, var/damage, var/attack_verb)
visible_message("<span class='danger'>[user] [attack_verb] the [src]!</span>")
playsound(src, 'sound/effects/attackblob.ogg', 100, 1)
playsound(src, 'sound/effects/glasshit.ogg', 100, 1)
user.do_attack_animation(src)
health -= damage
healthcheck()
@@ -100,7 +101,7 @@
tforce = 10
else
tforce = AM:throwforce
playsound(src, 'sound/effects/attackblob.ogg', 100, 1)
playsound(src, 'sound/effects/glasshit.ogg', 100, 1)
health = max(0, health - tforce)
healthcheck()
..()
@@ -120,7 +121,7 @@
var/mob/living/carbon/M = usr
if(locate(/obj/item/organ/internal/xenos/hivenode) in M.internal_organs)
for(var/mob/O in oviewers(src))
O.show_message("<span class='warning'>[usr] strokes the [name] and it melts away!</span>", 1)
O.show_message("<span class='warning'>[usr] strokes the [name] and it shifts away!</span>", 1)
health = 0
healthcheck()
return
@@ -137,7 +138,7 @@
user.setClickCooldown(user.get_attack_speed(W))
var/aforce = W.force
health = max(0, health - aforce)
playsound(src, 'sound/effects/attackblob.ogg', 100, 1)
playsound(src, 'sound/effects/glasshit.ogg', 100, 1)
healthcheck()
..()
return
code/game/objects/effects/decals/Cleanable/aliens.dm
+6
View File
@@ -4,6 +4,12 @@
icon = 'icons/effects/blood.dmi'
basecolor = "#05EE05"
/obj/effect/decal/cleanable/blood/skathari
name = "skathari blood"
desc = "The unmistakable green ichor of a Skathari invader."
icon = 'icons/effects/blood.dmi'
basecolor = "#96C24A"
/obj/effect/decal/cleanable/blood/gibs/xeno
name = "xeno gibs"
desc = "Gnarly..."
code/game/objects/effects/temporary_visuals/miscellaneous.dm
+5 -1
View File
@@ -24,6 +24,10 @@
icon_state = "smoke"
duration = 50
/obj/effect/temp_visual/bluespace_tear
icon_state = "bs_rift"
duration = 4
/obj/effect/temp_visual/impact_effect
icon_state = "impact_bullet"
plane = PLANE_LIGHTING_ABOVE // So they're visible even in a shootout in maint.
@@ -69,4 +73,4 @@
/obj/effect/temp_visual/impact_effect/ion
icon_state = "shieldsparkles"
duration = 6
duration = 6
code/game/objects/items/antag_spawners.dm
+1 -1
View File
@@ -80,7 +80,7 @@
qdel(src)
/obj/item/weapon/antag_spawner/technomancer_apprentice/equip_antag(mob/technomancer_mob)
var/datum/antagonist/technomancer/antag_datum = all_antag_types[MODE_TECHNOMANCER]
var/datum/antagonist/technomancer/antag_datum = SSantags.antag_datums[MODE_TECHNOMANCER]
antag_datum.equip_apprentice(technomancer_mob)
code/game/objects/items/devices/uplink_random_lists.dm
+2 -2
View File
@@ -108,8 +108,8 @@ var/datum/uplink_random_selection/all_uplink_selection = new/datum/uplink_random
#ifdef DEBUG
/proc/debug_uplink_purchage_log()
for(var/antag_type in all_antag_types)
var/datum/antagonist/A = all_antag_types[antag_type]
for(var/antag_type in SSantags.antag_datums)
var/datum/antagonist/A = SSantags.antag_datums[antag_type]
A.print_player_summary()
/proc/debug_uplink_item_assoc_list()
code/game/objects/items/weapons/storage/bags.dm
+1 -1
View File
@@ -366,7 +366,7 @@
desc = "A bag for storing pills, patches, and bottles."
max_storage_space = 200
w_class = ITEMSIZE_LARGE
slowdown = 3
slowdown = 1
can_hold = list(/obj/item/weapon/reagent_containers/pill,/obj/item/weapon/reagent_containers/glass/beaker,/obj/item/weapon/reagent_containers/glass/bottle)
// -----------------------------
code/game/objects/structures/ghost_pods/human.dm
+2 -2
View File
@@ -111,7 +111,7 @@
H.forceMove(T)
if(make_antag)
var/datum/antagonist/antag = all_antag_types[make_antag]
var/datum/antagonist/antag = SSantags.antag_datums[make_antag]
if(antag)
if(antag.add_antagonist(H.mind, 1, 1, 0, 1, 1))
log_admin("\The [src] made [key_name(src)] into a [antag.role_text].")
@@ -233,7 +233,7 @@
H.forceMove(T)
if(make_antag)
var/datum/antagonist/antag = all_antag_types[make_antag]
var/datum/antagonist/antag = SSantags.antag_datums[make_antag]
if(antag)
if(antag.add_antagonist(H.mind, 1, 1, 0, 1, 1))
log_admin("\The [src] made [key_name(src)] into a [antag.role_text].")
code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
+11 -11
View File
@@ -2,7 +2,7 @@
/obj/structure/bed/nest
name = "alien nest"
desc = "It's a gruesome pile of thick, sticky resin shaped like a nest."
desc = "It's a swirling mass of crystaline material shaped like a nest."
icon = 'icons/mob/alien.dmi'
icon_state = "nest"
var/health = 100
@@ -15,9 +15,9 @@
if(buckled_mob.buckled == src)
if(buckled_mob != user)
buckled_mob.visible_message(\
"<span class='notice'>[user.name] pulls [buckled_mob.name] free from the sticky nest!</span>",\
"<span class='notice'>[user.name] pulls you free from the gelatinous resin.</span>",\
"<span class='notice'>You hear squelching...</span>")
"<span class='notice'>[user.name] pulls [buckled_mob.name] free from the ensnaring nest!</span>",\
"<span class='notice'>[user.name] pulls you free from the hooked crystals.</span>",\
"<span class='notice'>You hear cracking...</span>")
buckled_mob.pixel_y = 0
buckled_mob.old_y = 0
unbuckle_mob(buckled_mob)
@@ -26,9 +26,9 @@
return
buckled_mob.last_special = world.time
buckled_mob.visible_message(\
"<span class='warning'>[buckled_mob.name] struggles to break free of the gelatinous resin...</span>",\
"<span class='warning'>You struggle to break free from the gelatinous resin...</span>",\
"<span class='notice'>You hear squelching...</span>")
"<span class='warning'>[buckled_mob.name] struggles to break free of the ensnaring nest...</span>",\
"<span class='warning'>You struggle to break free from the hooked crystals...</span>",\
"<span class='notice'>You hear cracking...</span>")
spawn(NEST_RESIST_TIME)
if(user && buckled_mob && user.buckled == src)
buckled_mob.last_special = world.time
@@ -57,9 +57,9 @@
return
else
M.visible_message(\
"<span class='notice'>[user.name] secretes a thick vile goo, securing [M.name] into [src]!</span>",\
"<span class='warning'>[user.name] drenches you in a foul-smelling resin, trapping you in the [src]!</span>",\
"<span class='notice'>You hear squelching...</span>")
"<span class='notice'>[user.name] secretes a rapidly solidifying liquid, securing [M.name] into [src]!</span>",\
"<span class='warning'>[user.name] coats you in a crystaline substance, trapping you in the [src]!</span>",\
"<span class='notice'>You hear cracking...</span>")
M.buckled = src
M.loc = src.loc
M.set_dir(src.dir)
@@ -73,7 +73,7 @@
/obj/structure/bed/nest/attackby(obj/item/weapon/W as obj, mob/user as mob)
var/aforce = W.force
health = max(0, health - aforce)
playsound(src, 'sound/effects/attackblob.ogg', 100, 1)
playsound(src, 'sound/effects/glasshit.ogg', 100, 1)
for(var/mob/M in viewers(src, 7))
M.show_message("<span class='warning'>[user] hits [src] with [W]!</span>", 1)
healthcheck()