cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 19:13:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub

Browse Source
This commit is contained in:
Aurorablade
2016-10-08 22:21:48 -04:00
parent d7a7815297 835a8e16a8
commit e2ce799aa1
345 changed files with 3493 additions and 3208 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/engicart.dm
+8 -8
View File
@@ -101,21 +101,21 @@
user.set_machine(src)
var/dat
if(myglass)
dat += "<a href='?src=\ref[src];glass=1'>[myglass.name]</a><br>"
dat += "<a href='?src=[UID()];glass=1'>[myglass.name]</a><br>"
if(mymetal)
dat += "<a href='?src=\ref[src];metal=1'>[mymetal.name]</a><br>"
dat += "<a href='?src=[UID()];metal=1'>[mymetal.name]</a><br>"
if(myplasteel)
dat += "<a href='?src=\ref[src];plasteel=1'>[myplasteel.name]</a><br>"
dat += "<a href='?src=[UID()];plasteel=1'>[myplasteel.name]</a><br>"
if(myflashlight)
dat += "<a href='?src=\ref[src];flashlight=1'>[myflashlight.name]</a><br>"
dat += "<a href='?src=[UID()];flashlight=1'>[myflashlight.name]</a><br>"
if(mybluetoolbox)
dat += "<a href='?src=\ref[src];bluetoolbox=1'>[mybluetoolbox.name]</a><br>"
dat += "<a href='?src=[UID()];bluetoolbox=1'>[mybluetoolbox.name]</a><br>"
if(myredtoolbox)
dat += "<a href='?src=\ref[src];redtoolbox=1'>[myredtoolbox.name]</a><br>"
dat += "<a href='?src=[UID()];redtoolbox=1'>[myredtoolbox.name]</a><br>"
if(myyellowtoolbox)
dat += "<a href='?src=\ref[src];yellowtoolbox=1'>[myyellowtoolbox.name]</a><br>"
dat += "<a href='?src=[UID()];yellowtoolbox=1'>[myyellowtoolbox.name]</a><br>"
if(myengitape)
dat += "<a href='?src=\ref[src];engitape=1'>[myengitape.name]</a><br>"
dat += "<a href='?src=[UID()];engitape=1'>[myengitape.name]</a><br>"
var/datum/browser/popup = new(user, "engicart", name, 240, 160)
popup.set_content(dat)
popup.open()
code/game/objects/structures/false_walls.dm
+2 -2
View File
@@ -240,14 +240,14 @@
canSmoothWith = list(/obj/structure/falsewall/alien, /turf/simulated/wall/mineral/alien)
/obj/structure/falsewall/clown
/obj/structure/falsewall/bananium
name = "bananium wall"
desc = "A wall with bananium plating. Honk!"
icon = 'icons/turf/walls/bananium_wall.dmi'
icon_state = ""
mineral = "clown"
walltype = "clown"
canSmoothWith = list(/obj/structure/falsewall/clown, /turf/simulated/wall/mineral/clown)
canSmoothWith = list(/obj/structure/falsewall/bananium, /turf/simulated/wall/mineral/bananium)
/obj/structure/falsewall/sandstone
name = "sandstone wall"
code/game/objects/structures/foodcart.dm
+12 -12
View File
@@ -76,29 +76,29 @@
user.set_machine(src)
var/dat
if(food_slots[1])
dat += "<a href='?src=\ref[src];f1=1'>[food_slots[1]]</a><br>"
dat += "<a href='?src=[UID()];f1=1'>[food_slots[1]]</a><br>"
if(food_slots[2])
dat += "<a href='?src=\ref[src];f2=1'>[food_slots[2]]</a><br>"
dat += "<a href='?src=[UID()];f2=1'>[food_slots[2]]</a><br>"
if(food_slots[3])
dat += "<a href='?src=\ref[src];f3=1'>[food_slots[3]]</a><br>"
dat += "<a href='?src=[UID()];f3=1'>[food_slots[3]]</a><br>"
if(food_slots[4])
dat += "<a href='?src=\ref[src];f4=1'>[food_slots[4]]</a><br>"
dat += "<a href='?src=[UID()];f4=1'>[food_slots[4]]</a><br>"
if(food_slots[5])
dat += "<a href='?src=\ref[src];f5=1'>[food_slots[5]]</a><br>"
dat += "<a href='?src=[UID()];f5=1'>[food_slots[5]]</a><br>"
if(food_slots[6])
dat += "<a href='?src=\ref[src];f6=1'>[food_slots[6]]</a><br>"
dat += "<a href='?src=[UID()];f6=1'>[food_slots[6]]</a><br>"
if(drink_slots[1])
dat += "<a href='?src=\ref[src];d1=1'>[drink_slots[1]]</a><br>"
dat += "<a href='?src=[UID()];d1=1'>[drink_slots[1]]</a><br>"
if(drink_slots[2])
dat += "<a href='?src=\ref[src];d2=1'>[drink_slots[2]]</a><br>"
dat += "<a href='?src=[UID()];d2=1'>[drink_slots[2]]</a><br>"
if(drink_slots[3])
dat += "<a href='?src=\ref[src];d3=1'>[drink_slots[3]]</a><br>"
dat += "<a href='?src=[UID()];d3=1'>[drink_slots[3]]</a><br>"
if(drink_slots[4])
dat += "<a href='?src=\ref[src];d4=1'>[drink_slots[4]]</a><br>"
dat += "<a href='?src=[UID()];d4=1'>[drink_slots[4]]</a><br>"
if(drink_slots[5])
dat += "<a href='?src=\ref[src];d5=1'>[drink_slots[5]]</a><br>"
dat += "<a href='?src=[UID()];d5=1'>[drink_slots[5]]</a><br>"
if(drink_slots[6])
dat += "<a href='?src=\ref[src];d6=1'>[drink_slots[6]]</a><br>"
dat += "<a href='?src=[UID()];d6=1'>[drink_slots[6]]</a><br>"
var/datum/browser/popup = new(user, "foodcart", name, 240, 160)
popup.set_content(dat)
popup.open()
code/game/objects/structures/janicart.dm
+5 -5
View File
@@ -113,15 +113,15 @@
user.set_machine(src)
var/dat
if(mybag)
dat += "<a href='?src=\ref[src];garbage=1'>[mybag.name]</a><br>"
dat += "<a href='?src=[UID()];garbage=1'>[mybag.name]</a><br>"
if(mymop)
dat += "<a href='?src=\ref[src];mop=1'>[mymop.name]</a><br>"
dat += "<a href='?src=[UID()];mop=1'>[mymop.name]</a><br>"
if(myspray)
dat += "<a href='?src=\ref[src];spray=1'>[myspray.name]</a><br>"
dat += "<a href='?src=[UID()];spray=1'>[myspray.name]</a><br>"
if(myreplacer)
dat += "<a href='?src=\ref[src];replacer=1'>[myreplacer.name]</a><br>"
dat += "<a href='?src=[UID()];replacer=1'>[myreplacer.name]</a><br>"
if(signs)
dat += "<a href='?src=\ref[src];sign=1'>[signs] sign\s</a><br>"
dat += "<a href='?src=[UID()];sign=1'>[signs] sign\s</a><br>"
var/datum/browser/popup = new(user, "janicart", name, 240, 160)
popup.set_content(dat)
popup.open()
code/game/objects/structures/noticeboard.dm
+1 -1
View File
@@ -32,7 +32,7 @@
/obj/structure/noticeboard/attack_hand(user as mob)
var/dat = "<B>Noticeboard</B><BR>"
for(var/obj/item/weapon/paper/P in src)
dat += "<A href='?src=\ref[src];read=\ref[P]'>[P.name]</A> <A href='?src=\ref[src];write=\ref[P]'>Write</A> <A href='?src=\ref[src];remove=\ref[P]'>Remove</A><BR>"
dat += "<A href='?src=[UID()];read=\ref[P]'>[P.name]</A> <A href='?src=[UID()];write=\ref[P]'>Write</A> <A href='?src=[UID()];remove=\ref[P]'>Remove</A><BR>"
user << browse("<HEAD><TITLE>Notices</TITLE></HEAD>[dat]","window=noticeboard")
onclose(user, "noticeboard")
code/game/objects/structures/safe.dm
+2 -2
View File
@@ -75,12 +75,12 @@ FLOOR SAFES
/obj/structure/safe/attack_hand(mob/user)
user.set_machine(src)
var/dat = "<center>"
dat += "<a href='?src=\ref[src];open=1'>[open ? "Close" : "Open"] [src]</a> | <a href='?src=\ref[src];decrement=1'>-</a> [dial * 5] <a href='?src=\ref[src];increment=1'>+</a>"
dat += "<a href='?src=[UID()];open=1'>[open ? "Close" : "Open"] [src]</a> | <a href='?src=[UID()];decrement=1'>-</a> [dial * 5] <a href='?src=[UID()];increment=1'>+</a>"
if(open)
dat += "<table>"
for(var/i = contents.len, i>=1, i--)
var/obj/item/P = contents[i]
dat += "<tr><td><a href='?src=\ref[src];retrieve=\ref[P]'>[P.name]</a></td></tr>"
dat += "<tr><td><a href='?src=[UID()];retrieve=\ref[P]'>[P.name]</a></td></tr>"
dat += "</table></center>"
user << browse("<html><head><title>[name]</title></head><body>[dat]</body></html>", "window=safe;size=350x300")
code/game/objects/structures/tank_dispenser.dm
+2 -2
View File
@@ -35,8 +35,8 @@
/obj/structure/dispenser/attack_hand(mob/user as mob)
user.set_machine(src)
var/dat = "[src]<br><br>"
dat += "Oxygen tanks: [oxygentanks] - [oxygentanks ? "<A href='?src=\ref[src];oxygen=1'>Dispense</A>" : "empty"]<br>"
dat += "Plasma tanks: [plasmatanks] - [plasmatanks ? "<A href='?src=\ref[src];plasma=1'>Dispense</A>" : "empty"]"
dat += "Oxygen tanks: [oxygentanks] - [oxygentanks ? "<A href='?src=[UID()];oxygen=1'>Dispense</A>" : "empty"]<br>"
dat += "Plasma tanks: [plasmatanks] - [plasmatanks ? "<A href='?src=[UID()];plasma=1'>Dispense</A>" : "empty"]"
user << browse(dat, "window=dispenser")
onclose(user, "dispenser")
return