cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-22 05:25:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into thanksfortheheadacheswj

Browse Source
This commit is contained in:
xxalpha
2016-01-30 19:45:45 +00:00
parent 83a4491756 43f9c228de
commit 062cb76e29
345 changed files with 14132 additions and 6760 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/holodeck/holo_effect.dm
+20 -14
View File
@@ -8,17 +8,20 @@
icon = 'icons/mob/screen_gen.dmi'
icon_state = "x2"
invisibility = 101
proc/activate(var/obj/machinery/computer/holodeck/HC)
return
proc/deactivate(var/obj/machinery/computer/holodeck/HC)
qdel(src)
return
// Called by the holodeck computer as long as the program is running
proc/tick(var/obj/machinery/computer/holodeck/HC)
return
proc/safety(var/active)
return
/obj/effect/holodeck_effect/proc/activate(var/obj/machinery/computer/holodeck/HC)
return
/obj/effect/holodeck_effect/proc/deactivate(var/obj/machinery/computer/holodeck/HC)
qdel(src)
return
// Called by the holodeck computer as long as the program is running
/obj/effect/holodeck_effect/proc/tick(var/obj/machinery/computer/holodeck/HC)
return
/obj/effect/holodeck_effect/proc/safety(var/active)
return
// Generates a holodeck-tracked card deck
@@ -34,7 +37,8 @@
return D
/obj/effect/holodeck_effect/cards/safety(active)
if(!D) return
if(!D)
return
if(active)
D.card_hitsound = null
D.card_force = 0
@@ -67,7 +71,8 @@
var/mob/mob = null
/obj/effect/holodeck_effect/mobspawner/activate(var/obj/machinery/computer/holodeck/HC)
if(islist(mobtype)) mobtype = pick(mobtype)
if(islist(mobtype))
mobtype = pick(mobtype)
mob = new mobtype(loc)
// these vars are not really standardized but all would theoretically create stuff on death
@@ -76,7 +81,8 @@
return mob
/obj/effect/holodeck_effect/mobspawner/deactivate(var/obj/machinery/computer/holodeck/HC)
if(mob) HC.derez(mob)
if(mob)
HC.derez(mob)
qdel(src)
/obj/effect/holodeck_effect/mobspawner/pet
@@ -84,4 +90,4 @@
/mob/living/simple_animal/butterfly, /mob/living/simple_animal/chick/holo,
/mob/living/simple_animal/pet/cat, /mob/living/simple_animal/pet/cat/kitten,
/mob/living/simple_animal/pet/dog/corgi, /mob/living/simple_animal/pet/dog/corgi/puppy,
/mob/living/simple_animal/pet/dog/pug, /mob/living/simple_animal/pet/fox)
/mob/living/simple_animal/pet/dog/pug, /mob/living/simple_animal/pet/fox)
code/modules/holodeck/items.dm
+4 -6
View File
@@ -23,13 +23,11 @@
armour_penetration = 50
var/active = 0
/obj/item/weapon/holo/esword/green
New()
item_color = "green"
/obj/item/weapon/holo/esword/green/New()
item_color = "green"
/obj/item/weapon/holo/esword/red
New()
item_color = "red"
/obj/item/weapon/holo/esword/red/New()
item_color = "red"
/obj/item/weapon/holo/esword/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance)
if(active)