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

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

Browse Source 
All hail glorious leader tigercat
This commit is contained in:
Crazylemon64
2016-07-08 00:16:28 -07:00
parent 20eee9064c 0eb6a653e8
commit a779fc8663
928 changed files with 8857 additions and 8457 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/shuttle/supply.dm
+15 -15
View File
@@ -484,7 +484,7 @@
if(..())
return 1
if (href_list["doorder"])
if(href_list["doorder"])
if(world.time < reqtime)
visible_message("<b>[src]</b>'s monitor flashes, \"[world.time - reqtime] seconds remaining until another requisition form may be printed.\"")
nanomanager.update_uis(src)
@@ -528,7 +528,7 @@
if(i == 1)
O.generateRequisition(loc)
else if (href_list["rreq"])
else if(href_list["rreq"])
var/ordernum = text2num(href_list["rreq"])
var/obj/item/weapon/card/id/I = usr.get_id_card()
for(var/i=1, i<=shuttle_master.requestlist.len, i++)
@@ -537,11 +537,11 @@
shuttle_master.requestlist.Cut(i,i+1)
break
else if (href_list["last_viewed_group"])
else if(href_list["last_viewed_group"])
content_pack = null
last_viewed_group = text2num(href_list["last_viewed_group"])
else if (href_list["contents"])
else if(href_list["contents"])
var/topic = href_list["contents"]
if(topic == 1)
content_pack = null
@@ -658,7 +658,7 @@
else if(!shuttle_master.supply.request(shuttle_master.getDock("supply_home")))
post_signal("supply")
else if (href_list["doorder"])
else if(href_list["doorder"])
if(world.time < reqtime)
visible_message("<b>[src]</b>'s monitor flashes, \"[world.time - reqtime] seconds remaining until another requisition form may be printed.\"")
nanomanager.update_uis(src)
@@ -721,7 +721,7 @@
to_chat(usr, "<span class='warning'>There are insufficient supply points for this request.</span>")
break
else if (href_list["rreq"])
else if(href_list["rreq"])
var/ordernum = text2num(href_list["rreq"])
for(var/i=1, i<=shuttle_master.requestlist.len, i++)
var/datum/supply_order/SO = shuttle_master.requestlist[i]
@@ -729,11 +729,11 @@
shuttle_master.requestlist.Cut(i,i+1)
break
else if (href_list["last_viewed_group"])
else if(href_list["last_viewed_group"])
content_pack = null
last_viewed_group = text2num(href_list["last_viewed_group"])
else if (href_list["contents"])
else if(href_list["contents"])
var/topic = href_list["contents"]
if(topic == 1)
content_pack = null
@@ -790,10 +790,10 @@
return prob(60)
var/obj/structure/stool/bed/B = A
if (istype(A, /obj/structure/stool/bed) && B.buckled_mob)//if it's a bed/chair and someone is buckled, it will not pass
if(istype(A, /obj/structure/stool/bed) && B.buckled_mob)//if it's a bed/chair and someone is buckled, it will not pass
return 0
if (istype(A, /obj/structure/closet/cardboard))
if(istype(A, /obj/structure/closet/cardboard))
var/obj/structure/closet/cardboard/C = A
if(C.move_delay)
return 0
@@ -830,13 +830,13 @@
/obj/structure/plasticflaps/ex_act(severity)
switch(severity)
if (1)
if(1)
qdel(src)
if (2)
if (prob(50))
if(2)
if(prob(50))
qdel(src)
if (3)
if (prob(5))
if(3)
if(prob(5))
qdel(src)
/obj/structure/plasticflaps/mining //A specific type for mining that doesn't allow airflow because of them damn crates