cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 05:57:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tiger's comments

Browse Source
This commit is contained in:
Markolie
2017-01-22 19:15:26 +01:00
parent 2cedb7b20b
commit d6276ae978
12 changed files with 38 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/is_helpers.dm
+8 -8
View File
@@ -3,22 +3,22 @@
#define ismovableatom(A) istype(A, /atom/movable)
// Mobs
#define ismegafauna(A) (istype(A, /mob/living/simple_animal/hostile/megafauna))
#define ismegafauna(A) istype(A, /mob/living/simple_animal/hostile/megafauna)
//Turfs
#define issimulatedturf(A) (istype(A, /turf/simulated))
#define issimulatedturf(A) istype(A, /turf/simulated)
#define isspaceturf(A) (istype(A, /turf/space))
#define isspaceturf(A) istype(A, /turf/space)
#define isfloorturf(A) (istype(A, /turf/simulated/floor))
#define isfloorturf(A) istype(A, /turf/simulated/floor)
#define isunsimulatedturf(A) (istype(A, /turf/unsimulated))
#define isunsimulatedturf(A) istype(A, /turf/unsimulated)
#define iswallturf(A) (istype(A, /turf/simulated/wall))
#define iswallturf(A) istype(A, /turf/simulated/wall)
#define isreinforcedwallturf(A) (istype(A, /turf/simulated/wall/r_wall))
#define isreinforcedwallturf(A) istype(A, /turf/simulated/wall/r_wall)
#define ismineralturf(A) (istype(A, /turf/simulated/mineral))
#define ismineralturf(A) istype(A, /turf/simulated/mineral)
// Misc
#define isclient(A) istype(A, /client)
code/datums/spell.dm
+1 -1
View File
@@ -138,7 +138,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
return 0
var/obj/effect/proc_holder/spell/noclothes/clothes_spell = locate() in (user.mob_spell_list | (user.mind ? user.mind.spell_list : list()))
if((ishuman(user) && clothes_req) && !(clothes_spell && istype(clothes_spell)))//clothes check
if((ishuman(user) && clothes_req) && !istype(clothes_spell))//clothes check
var/mob/living/carbon/human/H = user
if(!istype(H.wear_suit, /obj/item/clothing/suit/wizrobe) && !istype(H.wear_suit, /obj/item/clothing/suit/space/rig/wizard))
to_chat(user, "<span class='notice'>I don't feel strong enough without my robe.</span>")
code/datums/spells/shapeshift.dm
+3 -3
View File
@@ -14,9 +14,9 @@
var/shapeshift_type
var/list/current_shapes = list()
var/list/current_casters = list()
var/list/possible_shapes = list(/mob/living/simple_animal/mouse,\
/mob/living/simple_animal/pet/corgi,\
/mob/living/simple_animal/bot/ed209,\
var/list/possible_shapes = list(/mob/living/simple_animal/mouse,
/mob/living/simple_animal/pet/corgi,
/mob/living/simple_animal/bot/ed209,
/mob/living/simple_animal/hostile/construct/armoured)
/obj/effect/proc_holder/spell/targeted/shapeshift/cast(list/targets, mob/user = usr)
code/datums/spells/wizard.dm
+4 -4
View File
@@ -145,8 +145,8 @@
action_icon_state = "spell_teleport"
sound1="sound/magic/Teleport_diss.ogg"
sound2="sound/magic/Teleport_app.ogg"
sound1 = "sound/magic/Teleport_diss.ogg"
sound2 = "sound/magic/Teleport_app.ogg"
/obj/effect/proc_holder/spell/aoe_turf/conjure/forcewall
name = "Forcewall"
@@ -245,12 +245,12 @@
/obj/effect/proc_holder/spell/targeted/inflict_handler/blind
amt_eye_blind = 10
amt_eye_blurry = 20
sound="sound/magic/Blind.ogg"
sound = "sound/magic/Blind.ogg"
/obj/effect/proc_holder/spell/targeted/genetic/blind
disabilities = BLIND
duration = 300
sound="sound/magic/Blind.ogg"
sound = "sound/magic/Blind.ogg"
/obj/effect/proc_holder/spell/fireball
name = "Fireball"
code/game/gamemodes/wizard/rightandwrong.dm
+2 -2
View File
@@ -89,7 +89,7 @@
if("medibeam")
new /obj/item/weapon/gun/medbeam(get_turf(H))
playsound(get_turf(H),'sound/magic/Summon_guns.ogg', 50, 1)
playsound(get_turf(H), 'sound/magic/Summon_guns.ogg', 50, 1)
else
switch(randomizemagic)
if("fireball")
@@ -158,4 +158,4 @@
new /obj/item/device/necromantic_stone(get_turf(H))
to_chat(H, "<span class='notice'>You suddenly feel lucky.</span>")
playsound(get_turf(H),'sound/magic/Summon_Magic.ogg', 50, 1)
playsound(get_turf(H), 'sound/magic/Summon_Magic.ogg', 50, 1)
code/game/objects/effects/decals/Cleanable/fuel.dm
+7 -6
View File
@@ -7,12 +7,12 @@
var/amount = 1 //Basically moles.
/obj/effect/decal/cleanable/liquid_fuel/New(newLoc,amt=1)
src.amount = amt
amount = amt
//Be absorbed by any other liquid fuel in the tile.
for(var/obj/effect/decal/cleanable/liquid_fuel/other in newLoc)
if(other != src)
other.amount += src.amount
other.amount += amount
spawn other.Spread()
qdel(src)
@@ -26,7 +26,7 @@
if(!istype(S)) return
for(var/d in cardinal)
if(rand(25))
var/turf/simulated/target = get_step(src,d)
var/turf/simulated/target = get_step(src, d)
var/turf/simulated/origin = get_turf(src)
if(origin.CanPass(null, target, 0, 0) && target.CanPass(null, origin, 0, 0))
if(!locate(/obj/effect/decal/cleanable/liquid_fuel) in target)
@@ -36,9 +36,10 @@
/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel
icon_state = "mustard"
anchored = 0
New(newLoc, amt = 1, d = 0)
dir = d //Setting this direction means you won't get torched by your own flamethrower.
. = ..()
/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel/New(newLoc, amt = 1, d = 0)
dir = d //Setting this direction means you won't get torched by your own flamethrower.
. = ..()
/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel/Spread()
//The spread for flamethrower fuel is much more precise, to create a wide fire pattern.
code/game/objects/items/stacks/sheets/sheet_types.dm
+1 -1
View File
@@ -255,4 +255,4 @@ var/global/list/datum/stack_recipe/runed_metal_recipes = list ( \
w_class = 3
throw_speed = 1
throw_range = 3
origin_tech = "materials=2;biotech=2"
origin_tech = "materials=2;biotech=2"
code/game/objects/structures/crates_lockers/closets.dm
+1 -1
View File
@@ -410,4 +410,4 @@
/obj/structure/closet/get_remote_view_fullscreens(mob/user)
if(user.stat == DEAD || !(user.sight & (SEEOBJS|SEEMOBS)))
user.overlay_fullscreen("remote_view", /obj/screen/fullscreen/impaired, 1)
user.overlay_fullscreen("remote_view", /obj/screen/fullscreen/impaired, 1)
code/game/turfs/simulated/floor/fancy_floor.dm
-3
View File
@@ -61,9 +61,6 @@
new /obj/item/weapon/ore/glass/basalt(src)
user.visible_message("<span class='notice'>[user] digs up [src].</span>", "<span class='notice'>You uproot [src].</span>")
playsound(src, 'sound/effects/shovel_dig.ogg', 50, 1)
make_plating()
else
return
/turf/simulated/floor/basalt/New()
..()
code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
-2
View File
@@ -198,8 +198,6 @@
overlays.Cut()
if(panel_open)
overlays += image(icon, "[initial(icon_state)]-panel")
return .
/obj/machinery/smartfridge/attackby(obj/item/O, var/mob/user)
if(default_deconstruction_screwdriver(user, O))
code/modules/mining/lavaland/colossus_loot.dm
+1 -1
View File
@@ -163,7 +163,7 @@
var/mob/living/carbon/human/H = user
for(var/obj/item/W in H)
H.unEquip(W)
var/datum/job/clown/C = new /datum/job/clown()
var/datum/job/clown/C = job_master.GetJob("Clown")
C.equip(H)
qdel(C)
affected_targets.Add(H)
code/modules/mob/living/simple_animal/friendly/cockroach.dm
+10 -13
View File
@@ -27,20 +27,17 @@
..()
/mob/living/simple_animal/cockroach/Crossed(var/atom/movable/AM)
if(ismob(AM))
if(isliving(AM))
var/mob/living/A = AM
if(A.mob_size > MOB_SIZE_SMALL)
if(prob(squish_chance))
A.visible_message("<span class='notice'>\The [A] squashed \the [name].</span>", "<span class='notice'>You squashed \the [name].</span>")
death()
else
visible_message("<span class='notice'>\The [name] avoids getting crushed.</span>")
else
if(isobj(AM))
if(istype(AM,/obj/structure))
visible_message("<span class='notice'>As \the [AM] moved over \the [name], it was crushed.</span>")
if(isliving(AM))
var/mob/living/A = AM
if(A.mob_size > MOB_SIZE_SMALL)
if(prob(squish_chance))
A.visible_message("<span class='notice'>\The [A] squashed \the [name].</span>", "<span class='notice'>You squashed \the [name].</span>")
death()
else
visible_message("<span class='notice'>\The [name] avoids getting crushed.</span>")
else if(istype(AM, /obj/structure))
visible_message("<span class='notice'>As \the [AM] moved over \the [name], it was crushed.</span>")
death()
/mob/living/simple_animal/cockroach/ex_act() //Explosions are a terrible way to handle a cockroach.
return