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

Fixes issue 1097. Shaft Miners not getting pda

Browse Source 
Fixes issue 1118. duplicating trashbags
Fixes issue 1117. evidence bag issues

Syndie shuttle can now travel to mining and the tcomms sat.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5152 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
petethegoat@gmail.com
2012-11-21 17:17:00 +00:00
parent ab9c532ae8
commit 0c9195fbe4
12 changed files with 3174 additions and 3149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/area/Space Station 13 areas.dm
+29 -20
View File
@@ -426,41 +426,50 @@ proc/process_ghost_teleport_locs()
//ENEMY
//names are used
/area/syndicate_station
name = "\improper Syndicate Station"
icon_state = "yellow"
requires_power = 0
/area/syndicate_station/start
name = "\improper Syndicate Station Start"
name = "\improper Syndicate Forward Operating Base"
icon_state = "yellow"
/area/syndicate_station/one
name = "\improper Syndicate Station Location 1"
icon_state = "green"
/area/syndicate_station/southwest
name = "south-west of SS13"
icon_state = "southwest"
/area/syndicate_station/two
name = "\improper Syndicate Station Location 2"
icon_state = "green"
/area/syndicate_station/northwest
name = "north-west of SS13"
icon_state = "northwest"
/area/syndicate_station/three
name = "\improper Syndicate Station Location 3"
icon_state = "green"
/area/syndicate_station/northeast
name = "north-east of SS13"
icon_state = "northeast"
/area/syndicate_station/four
name = "\improper Syndicate Station Location 4"
icon_state = "green"
/area/syndicate_station/southeast
name = "south-east of SS13"
icon_state = "southeast"
/area/syndicate_station/five
name = "\improper Syndicate Station Location 5"
icon_state = "green"
/area/syndicate_station/north
name = "north of SS13"
icon_state = "north"
/area/syndicate_station/six
name = "\improper Syndicate Station Location 6"
icon_state = "green"
/area/syndicate_station/south
name = "south of SS13"
icon_state = "south"
/area/syndicate_station/commssat
name = "south of the communication satellite"
icon_state = "south"
/area/syndicate_station/mining
name = "north of the mining asteroid"
icon_state = "north"
/area/syndicate_station/transit
name = "\improper Syndicate Station Transit"
name = "hyperspace"
icon_state = "shuttle"
/area/wizard_station
code/game/jobs/job/civilian.dm
+1 -1
View File
@@ -145,8 +145,8 @@
H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_mine (H), slot_ears)
if(H.backbag == 2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/industrial (H), slot_back)
if(H.backbag == 3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_eng(H), slot_back)
H.equip_to_slot_or_del(new /obj/item/device/pda/shaftminer(H), slot_belt)
H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/miner(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/device/pda/shaftminer(H), slot_belt)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes)
H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves)
if(H.backbag == 1)
code/game/machinery/computer/syndicate_shuttle.dm
+12 -6
View File
@@ -60,6 +60,8 @@
<a href='?src=\ref[src];station_sw=1'>South West of SS13</a> |
<a href='?src=\ref[src];station_s=1'>South of SS13</a> |
<a href='?src=\ref[src];station_se=1'>South East of SS13</a><br>
<a href='?src=\ref[src];commssat=1'>South of the Communication Satellite"</a> |
<a href='?src=\ref[src];mining=1'>North of the Mining Asteroid</a><br>
<a href='?src=\ref[user];mach_close=computer'>Close</a>"}
user << browse(dat, "window=computer;size=575x450")
@@ -77,17 +79,21 @@
if(href_list["syndicate"])
syndicate_move_to(/area/syndicate_station/start)
else if(href_list["station_nw"])
syndicate_move_to(/area/syndicate_station/two)
syndicate_move_to(/area/syndicate_station/northwest)
else if(href_list["station_n"])
syndicate_move_to(/area/syndicate_station/five)
syndicate_move_to(/area/syndicate_station/north)
else if(href_list["station_ne"])
syndicate_move_to(/area/syndicate_station/three)
syndicate_move_to(/area/syndicate_station/northeast)
else if(href_list["station_sw"])
syndicate_move_to(/area/syndicate_station/one)
syndicate_move_to(/area/syndicate_station/southwest)
else if(href_list["station_s"])
syndicate_move_to(/area/syndicate_station/six)
syndicate_move_to(/area/syndicate_station/south)
else if(href_list["station_se"])
syndicate_move_to(/area/syndicate_station/four)
syndicate_move_to(/area/syndicate_station/southeast)
else if(href_list["commssat"])
syndicate_move_to(/area/syndicate_station/commssat)
else if(href_list["mining"])
syndicate_move_to(/area/syndicate_station/mining)
add_fingerprint(usr)
updateUsrDialog()
code/game/objects/items/weapons/trashbag.dm
+11 -11
View File
@@ -1,14 +1,14 @@
/obj/item/weapon/trashbag
name = "trash bag"
desc = "A heavy-duty, no fun allowed trash bag."
desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"
icon = 'icons/obj/trash.dmi'
icon_state = "trashbag0"
item_state = "trashbag"
flags = FPRINT | TABLEPASS
slot_flags = SLOT_BELT
w_class = 2.0
var/mode = 1; //0 = pick one at a time, 1 = pick all on tile
var/capacity = 25; //the number of trash it can carry.
w_class = 4
var/mode = 1 //0 = pick one at a time, 1 = pick all on tile
var/capacity = 25 //the amount of trash it can carry.
/obj/item/weapon/trashbag/update_icon()
if(contents.len == 0)
@@ -19,13 +19,13 @@
icon_state = "trashbag2"
else icon_state = "trashbag3"
/obj/item/weapon/trashbag/attackby(obj/item/W as obj, mob/living/user as mob)
/obj/item/weapon/trashbag/attackby(obj/item/I as obj, mob/user as mob)
..()
if(contents.len < capacity)
if(istype(W, /obj/item))
if(W.w_class <= 2)
var/obj/item/O = W
contents += O
if(istype(I, /obj/item))
if(I.w_class <= 2)
user.drop_item()
I.loc = src
else
user << "<span class='notice'>[src] is full!</span>"
@@ -36,7 +36,7 @@
update_icon()
user << "<span class='notice'>You empty [src] onto [user.loc].</span>"
/obj/item/weapon/trashbag/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag)
/obj/item/weapon/trashbag/afterattack(atom/target as mob|obj|turf|area, mob/user as mob|obj, flag)
if(istype(target, /obj/item))
var/obj/item/W = target
if(W.w_class <= 2)
@@ -47,7 +47,7 @@
if(istype(O, /obj/item/weapon/disk/nuclear)) continue //No nuke disks - Nodrak
if(contents.len < capacity)
if(O.w_class <= 2)
contents += O;
O.loc = src
else
user << "<span class='notice'>[src] is full!</span>"
break