mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-18 18:44:48 +01:00
Just some general cleanup
Moved the spacecraft folder into the unused section, moved syndiebeacon into machinery. Research moved into Modules. Virus2 moved into WIP - is anyone even working on this, it looks almost done? Computer2,optics,pda2,experimental moved unto unused. WIP Chemistry things moved into Chemical Module Cameras.dm moved into weapons GameKit.dm moved into unused BrokenInHands.dm moved into unused Removed Grillify.dm Moved all of the files listed as unused in the mining module to unused Removed several empty folders in modules Moved cloning.dm into machinery Moved NewBan.dm into admin Changed humanoid aliens new_life.dm into life.dm Moved beast mob into unused Moved hivebot into unused Moved carpedexplosion.dm into unused Moved ai_lockdown.dm verb into unused and removed it from the AIs verb list as it didn't actually do anything. Removed mastercontroler2.dm Moved savefile.dm from human to new_player Bugfix People spawning on the starting screen on rev/cult should be fixed. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1964 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
mport2004@gmail.com
@@ -1,83 +0,0 @@
|
||||
/proc/carpetsplosion(turf/location as turf,range = 10)
|
||||
var/obj/effects/spreader/spreadEpicentre = new /obj/effects/spreader(location,range)
|
||||
var/list/turf/spreadTurfs = list()
|
||||
|
||||
sleep(5)
|
||||
|
||||
for(var/obj/effects/spreader/spread in spreadEpicentre.spreadList)
|
||||
spreadTurfs += get_turf(spread)
|
||||
|
||||
del(spreadEpicentre)
|
||||
return
|
||||
|
||||
//DEBUG START
|
||||
/obj/carpetnade
|
||||
New()
|
||||
..()
|
||||
carpetsplosion(loc)
|
||||
|
||||
//DEBUG END
|
||||
|
||||
/obj/effects/spreader
|
||||
var/list/obj/effects/spreader/spreadList = list()
|
||||
|
||||
/obj/effects/spreader/Del()
|
||||
for(var/obj/effects/spreader/spread in spreadList)
|
||||
if(spread != src)
|
||||
del(spread)
|
||||
..()
|
||||
|
||||
/obj/effects/spreader/New(location,var/amount = 1,obj/effects/spreader/source = src) //just a copypaste job from foam
|
||||
if(amount <= 0)
|
||||
del(src)
|
||||
return
|
||||
else
|
||||
..()
|
||||
|
||||
for(var/direction in cardinal)
|
||||
var/turf/T = get_step(src,direction)
|
||||
if(!T)
|
||||
continue
|
||||
|
||||
if(!T.Enter(src))
|
||||
continue
|
||||
|
||||
var/obj/effects/spreader/S = locate() in T
|
||||
if(S)
|
||||
continue
|
||||
|
||||
new /obj/effects/spreader(T,amount-1,source)
|
||||
|
||||
source.spreadList += src
|
||||
|
||||
/*
|
||||
/obj/effects/foam/proc/process()
|
||||
if(--amount < 0)
|
||||
return
|
||||
|
||||
|
||||
while(expand) // keep trying to expand while true
|
||||
|
||||
for(var/direction in cardinal)
|
||||
|
||||
|
||||
var/turf/T = get_step(src,direction)
|
||||
if(!T)
|
||||
continue
|
||||
|
||||
if(!T.Enter(src))
|
||||
continue
|
||||
|
||||
var/obj/effects/foam/F = locate() in T
|
||||
if(F)
|
||||
continue
|
||||
|
||||
F = new(T, metal)
|
||||
F.amount = amount
|
||||
if(!metal)
|
||||
F.create_reagents(10)
|
||||
if (reagents)
|
||||
for(var/datum/reagent/R in reagents.reagent_list)
|
||||
F.reagents.add_reagent(R.id,1)
|
||||
sleep(15)
|
||||
*/
|
||||
@@ -300,7 +300,7 @@
|
||||
|
||||
if (istype(M, /mob/living/carbon/human))
|
||||
var/mob/living/carbon/human/H = M
|
||||
if (ishuman(user) || isrobot(user) || ishivebot(user) || ismonkey(user) || isalien(user))
|
||||
if (ishuman(user) || isrobot(user) || ismonkey(user) || isalien(user))
|
||||
if (!( def_zone ))
|
||||
var/mob/user2 = user
|
||||
var/t = user2:zone_sel.selecting
|
||||
|
||||
@@ -0,0 +1,160 @@
|
||||
/obj/item/weapon/storage/photo_album
|
||||
name = "Photo album"
|
||||
icon = 'items.dmi'
|
||||
icon_state = "album"
|
||||
item_state = "briefcase"
|
||||
can_hold = list("/obj/item/weapon/photo",)
|
||||
|
||||
/obj/item/weapon/storage/photo_album/MouseDrop(obj/over_object as obj)
|
||||
|
||||
if ((istype(usr, /mob/living/carbon/human) || (ticker && ticker.mode.name == "monkey")))
|
||||
var/mob/M = usr
|
||||
if (!( istype(over_object, /obj/screen) ))
|
||||
return ..()
|
||||
playsound(src.loc, "rustle", 50, 1, -5)
|
||||
if ((!( M.restrained() ) && !( M.stat ) && M.back == src))
|
||||
if (over_object.name == "r_hand")
|
||||
if (!( M.r_hand ))
|
||||
M.u_equip(src)
|
||||
M.r_hand = src
|
||||
else
|
||||
if (over_object.name == "l_hand")
|
||||
if (!( M.l_hand ))
|
||||
M.u_equip(src)
|
||||
M.l_hand = src
|
||||
M.update_clothing()
|
||||
src.add_fingerprint(usr)
|
||||
return
|
||||
if(over_object == usr && in_range(src, usr) || usr.contents.Find(src))
|
||||
if (usr.s_active)
|
||||
usr.s_active.close(usr)
|
||||
src.show_to(usr)
|
||||
return
|
||||
return
|
||||
|
||||
/obj/item/weapon/storage/photo_album/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
||||
..()
|
||||
|
||||
/obj/item/weapon/camera_test
|
||||
name = "camera"
|
||||
icon = 'items.dmi'
|
||||
desc = "A one use - polaroid camera. 10 photos left."
|
||||
icon_state = "camera"
|
||||
item_state = "electropack"
|
||||
w_class = 2.0
|
||||
flags = 466.0
|
||||
m_amt = 2000
|
||||
throwforce = 5
|
||||
throw_speed = 4
|
||||
throw_range = 10
|
||||
var/pictures_left = 10
|
||||
var/can_use = 1
|
||||
|
||||
/obj/item/weapon/photo
|
||||
name = "photo"
|
||||
icon = 'items.dmi'
|
||||
icon_state = "photo"
|
||||
item_state = "clipboard"
|
||||
w_class = 1.0
|
||||
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
/obj/item/weapon/camera_test/attack(mob/living/carbon/human/M as mob, mob/user as mob)
|
||||
return
|
||||
|
||||
/obj/item/weapon/camera_test/afterattack(atom/target as mob|obj|turf|area, mob/user as mob, flag)
|
||||
if (!can_use || !pictures_left || ismob(target.loc)) return
|
||||
|
||||
var/turf/the_turf = get_turf(target)
|
||||
|
||||
var/icon/photo = icon('items.dmi',"photo")
|
||||
|
||||
var/icon/turficon = build_composite_icon(the_turf)
|
||||
turficon.Scale(22,20)
|
||||
|
||||
photo.Blend(turficon,ICON_OVERLAY,6,8)
|
||||
|
||||
var/mob_title = null
|
||||
var/mob_detail = null
|
||||
|
||||
var/item_title = null
|
||||
var/item_detail = null
|
||||
|
||||
var/itemnumber = 0
|
||||
for(var/atom/A in the_turf)
|
||||
if(A.invisibility) continue
|
||||
if(ismob(A))
|
||||
var/icon/X = build_composite_icon(A)
|
||||
X.Scale(22,20)
|
||||
photo.Blend(X,ICON_OVERLAY,6,8)
|
||||
del(X)
|
||||
|
||||
if(!mob_title)
|
||||
mob_title = "[A]"
|
||||
else
|
||||
mob_title += " and [A]"
|
||||
|
||||
if(!mob_detail)
|
||||
|
||||
var/holding = null
|
||||
if(istype(A, /mob/living/carbon))
|
||||
var/mob/living/carbon/temp = A
|
||||
if(temp.l_hand || temp.r_hand)
|
||||
if(temp.l_hand) holding = "They are holding \a [temp.l_hand]"
|
||||
if(temp.r_hand)
|
||||
if(holding)
|
||||
holding += " and \a [temp.r_hand]."
|
||||
else
|
||||
holding = "They are holding \a [temp.r_hand]."
|
||||
|
||||
if(!mob_detail)
|
||||
mob_detail = "You can see [A] on the photo[A:health < 75 ? " - [A] looks hurt":""].[holding ? " [holding]":"."]"
|
||||
else
|
||||
mob_detail += "You can also see [A] on the photo[A:health < 75 ? " - [A] looks hurt":""].[holding ? " [holding]":"."]"
|
||||
|
||||
else
|
||||
if(itemnumber < 5)
|
||||
var/icon/X = build_composite_icon(A)
|
||||
X.Scale(22,20)
|
||||
photo.Blend(X,ICON_OVERLAY,6,8)
|
||||
del(X)
|
||||
itemnumber++
|
||||
|
||||
if(!item_title)
|
||||
item_title = " \a [A]"
|
||||
else
|
||||
item_title = " some objects"
|
||||
|
||||
if(!item_detail)
|
||||
item_detail = "\a [A]"
|
||||
else
|
||||
item_detail += " and \a [A]"
|
||||
|
||||
var/finished_title = null
|
||||
var/finished_detail = null
|
||||
|
||||
if(!item_title && !mob_title)
|
||||
finished_title = "boring photo"
|
||||
finished_detail = "This is a pretty boring photo of \a [the_turf]."
|
||||
else
|
||||
if(mob_title)
|
||||
finished_title = "photo of [mob_title][item_title ? " and[item_title]":""]"
|
||||
finished_detail = "[mob_detail][item_detail ? " Theres also [item_detail].":"."]"
|
||||
else if(item_title)
|
||||
finished_title = "photo of[item_title]"
|
||||
finished_detail = "You can see [item_detail]."
|
||||
|
||||
var/obj/item/weapon/photo/P = new/obj/item/weapon/photo( get_turf(src) )
|
||||
|
||||
P.icon = photo
|
||||
P.name = finished_title
|
||||
P.desc = finished_detail
|
||||
|
||||
playsound(src.loc, pick('polaroid1.ogg','polaroid2.ogg'), 75, 1, -3)
|
||||
|
||||
pictures_left--
|
||||
src.desc = "A one use - polaroid camera. [pictures_left] photos left."
|
||||
user << "\blue [pictures_left] photos left."
|
||||
can_use = 0
|
||||
spawn(50) can_use = 1
|
||||
|
||||
@@ -1,138 +0,0 @@
|
||||
/*
|
||||
CONTAINS:
|
||||
THAT STUPID GAME KIT
|
||||
Which I am commenting out /N
|
||||
*/
|
||||
/*
|
||||
/obj/item/weapon/game_kit/New()
|
||||
src.board_stat = "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"
|
||||
src.selected = "CR"
|
||||
|
||||
/obj/item/weapon/game_kit/attack_paw(mob/user as mob)
|
||||
return src.attack_hand(user)
|
||||
|
||||
/obj/item/weapon/game_kit/MouseDrop(mob/user as mob)
|
||||
if (user == usr && !usr.restrained() && !usr.stat && (usr.contents.Find(src) || in_range(src, usr)))
|
||||
if (usr.hand)
|
||||
if (!usr.l_hand)
|
||||
spawn (0)
|
||||
src.attack_hand(usr, 1, 1)
|
||||
else
|
||||
if (!usr.r_hand)
|
||||
spawn (0)
|
||||
src.attack_hand(usr, 0, 1)
|
||||
|
||||
/obj/item/weapon/game_kit/proc/update()
|
||||
var/dat = text("<CENTER><B>Game Board</B></CENTER><BR><a href='?src=\ref[];mode=hia'>[]</a> <a href='?src=\ref[];mode=remove'>remove</a><HR><table width= 256 border= 0 height= 256 cellspacing= 0 cellpadding= 0 >", src, (src.selected ? text("Selected: []", src.selected) : "Nothing Selected"), src)
|
||||
for (var/y = 1 to 8)
|
||||
dat += "<tr>"
|
||||
|
||||
for (var/x = 1 to 8)
|
||||
var/color = (y + x) % 2 ? "#ffffff" : "#999999"
|
||||
var/piece = copytext(src.board_stat, ((y - 1) * 8 + x) * 2 - 1, ((y - 1) * 8 + x) * 2 + 1)
|
||||
|
||||
dat += "<td>"
|
||||
dat += "<td style='background-color:[color]' width=32 height=32>"
|
||||
if (piece != "BB")
|
||||
dat += "<a href='?src=\ref[src];s_board=[x] [y]'><img src='[src.base_url]/board_[piece].png' width=32 height=32 border=0>"
|
||||
else
|
||||
dat += "<a href='?src=\ref[src];s_board=[x] [y]'><img src='[src.base_url]/board_none.png' width=32 height=32 border=0>"
|
||||
dat += "</td>"
|
||||
|
||||
dat += "</tr>"
|
||||
|
||||
dat += "</table><HR><B>Chips:</B><BR>"
|
||||
for (var/piece in list("CB", "CR"))
|
||||
dat += "<a href='?src=\ref[src];s_piece=[piece]'><img src='[src.base_url]/board_[piece].png' width=32 height=32 border=0></a>"
|
||||
|
||||
dat += "<HR><B>Chess pieces:</B><BR>"
|
||||
for (var/piece in list("WP", "WK", "WQ", "WI", "WN", "WR"))
|
||||
dat += "<a href='?src=\ref[src];s_piece=[piece]'><img src='[src.base_url]/board_[piece].png' width=32 height=32 border=0></a>"
|
||||
dat += "<br>"
|
||||
for (var/piece in list("BP", "BK", "BQ", "BI", "BN", "BR"))
|
||||
dat += "<a href='?src=\ref[src];s_piece=[piece]'><img src='[src.base_url]/board_[piece].png' width=32 height=32 border=0></a>"
|
||||
src.data = dat
|
||||
|
||||
/obj/item/weapon/game_kit/attack_hand(mob/user as mob, unused, flag)
|
||||
|
||||
if (flag)
|
||||
return ..()
|
||||
else
|
||||
user.machine = src
|
||||
if (!( src.data ))
|
||||
update()
|
||||
user << browse(src.data, "window=game_kit")
|
||||
onclose(user, "game_kit")
|
||||
return
|
||||
return
|
||||
|
||||
/obj/item/weapon/game_kit/Topic(href, href_list)
|
||||
..()
|
||||
if ((usr.stat || usr.restrained()))
|
||||
return
|
||||
|
||||
if (usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf)))
|
||||
if (href_list["s_piece"])
|
||||
src.selected = href_list["s_piece"]
|
||||
else if (href_list["mode"])
|
||||
if (href_list["mode"] == "remove")
|
||||
src.selected = "remove"
|
||||
else
|
||||
src.selected = null
|
||||
else if (href_list["s_board"])
|
||||
if (!( src.selected ))
|
||||
src.selected = href_list["s_board"]
|
||||
else
|
||||
var/tx = text2num(copytext(href_list["s_board"], 1, 2))
|
||||
var/ty = text2num(copytext(href_list["s_board"], 3, 4))
|
||||
if ((copytext(src.selected, 2, 3) == " " && length(src.selected) == 3))
|
||||
var/sx = text2num(copytext(src.selected, 1, 2))
|
||||
var/sy = text2num(copytext(src.selected, 3, 4))
|
||||
var/place = ((sy - 1) * 8 + sx) * 2 - 1
|
||||
src.selected = copytext(src.board_stat, place, place + 2)
|
||||
if (place == 1)
|
||||
src.board_stat = text("BB[]", copytext(src.board_stat, 3, 129))
|
||||
else
|
||||
if (place == 127)
|
||||
src.board_stat = text("[]BB", copytext(src.board_stat, 1, 127))
|
||||
else
|
||||
if (place)
|
||||
src.board_stat = text("[]BB[]", copytext(src.board_stat, 1, place), copytext(src.board_stat, place + 2, 129))
|
||||
place = ((ty - 1) * 8 + tx) * 2 - 1
|
||||
if (place == 1)
|
||||
src.board_stat = text("[][]", src.selected, copytext(src.board_stat, 3, 129))
|
||||
else
|
||||
if (place == 127)
|
||||
src.board_stat = text("[][]", copytext(src.board_stat, 1, 127), src.selected)
|
||||
else
|
||||
if (place)
|
||||
src.board_stat = text("[][][]", copytext(src.board_stat, 1, place), src.selected, copytext(src.board_stat, place + 2, 129))
|
||||
src.selected = null
|
||||
else
|
||||
if (src.selected == "remove")
|
||||
var/place = ((ty - 1) * 8 + tx) * 2 - 1
|
||||
if (place == 1)
|
||||
src.board_stat = text("BB[]", copytext(src.board_stat, 3, 129))
|
||||
else
|
||||
if (place == 127)
|
||||
src.board_stat = text("[]BB", copytext(src.board_stat, 1, 127))
|
||||
else
|
||||
if (place)
|
||||
src.board_stat = text("[]BB[]", copytext(src.board_stat, 1, place), copytext(src.board_stat, place + 2, 129))
|
||||
else
|
||||
if (length(src.selected) == 2)
|
||||
var/place = ((ty - 1) * 8 + tx) * 2 - 1
|
||||
if (place == 1)
|
||||
src.board_stat = text("[][]", src.selected, copytext(src.board_stat, 3, 129))
|
||||
else
|
||||
if (place == 127)
|
||||
src.board_stat = text("[][]", copytext(src.board_stat, 1, 127), src.selected)
|
||||
else
|
||||
if (place)
|
||||
src.board_stat = text("[][][]", copytext(src.board_stat, 1, place), src.selected, copytext(src.board_stat, place + 2, 129))
|
||||
src.add_fingerprint(usr)
|
||||
update()
|
||||
for(var/mob/M in viewers(1, src))
|
||||
if ((M.client && M.machine == src))
|
||||
src.attack_hand(M)
|
||||
*/
|
||||
Reference in New Issue
Block a user