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

Added in some new boots for security to use.

Browse Source 
Added in a bulletproof vest and laser protective vest, both spawn in the armory and in armor crates.
Security Officers spawn with their new boots.
Security Lockers now have the new boots inside them.
Some MULEbot patching thanks to Trubble_bass. The PDA list should no longer show the hallway navigation beacons.
Shuttle walls are no longer autosmoothed. This has to be done manually in the map as it was causing some graphical errors.
Added in new boots and armor sprites. Credit goes to Firecage for them.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1755 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
Superxpdude@gmail.com
2011-07-02 18:37:35 +00:00
parent 6d2331729d
commit 5da34a92ea
16 changed files with 8599 additions and 8579 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/jobs/jobprocs.dm
+1 -1
View File
@@ -416,7 +416,7 @@
src.equip_if_possible(new /obj/item/clothing/under/rank/security(src), slot_w_uniform)
src.equip_if_possible(new /obj/item/clothing/suit/armor/vest(src), slot_wear_suit)
src.equip_if_possible(new /obj/item/clothing/head/helmet(src), slot_head)
src.equip_if_possible(new /obj/item/clothing/shoes/brown(src), slot_shoes)
src.equip_if_possible(new /obj/item/clothing/shoes/jackboots(src), slot_shoes)
// src.equip_if_possible(new /obj/item/clothing/glasses/sunglasses(src), slot_glasses)
src.equip_if_possible(new /obj/item/weapon/handcuffs(src), slot_in_backpack)
src.equip_if_possible(new /obj/item/weapon/handcuffs(src), slot_s_store)
code/game/machinery/bots/mulebot.dm
+1 -1
View File
@@ -18,7 +18,7 @@
var/locked = 1
var/atom/movable/load = null // the loaded crate (usually)
var/beacon_freq = 1445
var/beacon_freq = 1400
var/control_freq = 1447
suffix = ""
code/game/objects/closets/secure/security.dm
+1 -1
View File
@@ -9,7 +9,7 @@
new /obj/item/weapon/gun/energy/taser(src)
new /obj/item/device/flash(src)
new /obj/item/clothing/under/rank/security(src)
new /obj/item/clothing/shoes/brown(src)
new /obj/item/clothing/shoes/jackboots(src)
new /obj/item/clothing/suit/armor/vest(src)
new /obj/item/clothing/head/helmet(src)
new /obj/item/clothing/glasses/sunglasses(src)
code/game/objects/devices/PDA/radio.dm
+1 -1
View File
@@ -115,7 +115,7 @@
var/list/botstatus // the status signal sent by the bot
var/list/beacons
var/beacon_freq = 1445
var/beacon_freq = 1400
var/control_freq = 1447
// create a new QM cartridge, and register to receive bot control & beacon message
code/game/smoothwall.dm
+8 -8
View File
@@ -18,7 +18,7 @@
/* Commenting this out for now until we figure out what to do with shuttle smooth walls, if anything.
As they are now, they sort of work screwy and may need further coding. Or just be scrapped.*/
else
/*else
for(var/turf/simulated/shuttle/wall/W in orange(src,1))
if(abs(src.x-W.x)-abs(src.y-W.y)) //doesn't count diagonal walls
junction |= get_dir(src,W)
@@ -30,7 +30,7 @@
junction |= get_dir(src,W)
for(var/obj/grille/W in orange(src,1)) //same for grilles. checking if area is shuttle so it won't merge with the station
if((abs(src.x-W.x)-abs(src.y-W.y)) && (istype(W.loc.loc,/area/shuttle) || istype(W.loc.loc,/area/supply)))
junction |= get_dir(src,W)
junction |= get_dir(src,W)*/
if(istype(src,/turf/simulated/wall))
var/turf/simulated/wall/wall = src
@@ -39,7 +39,7 @@
src.icon_state = "rwall[junction]"
else if (istype(src,/obj/falsewall))
src.icon_state = "wall[junction]"
else if(istype(src,/turf/simulated/shuttle/wall))
/* else if(istype(src,/turf/simulated/shuttle/wall))
var/newicon = icon;
var/newiconstate = icon_state;
if(junction!=5 && junction!=6 && junction!=9 && junction!=10) //if it's not diagonal, all is well, no additional calculations needed
@@ -69,7 +69,7 @@
src.icon_state = newiconstate; //
src.overlays += icon('shuttle.dmi',"swall_f[junction]")
else //otherwise, the space one
src.icon_state = "swall_s[junction]"
src.icon_state = "swall_s[junction]"*/
return
@@ -93,14 +93,14 @@
..()
/turf/simulated/shuttle/wall/New()
/*/turf/simulated/shuttle/wall/New()
spawn(20) //testing if this will make /obj/machinery/shuttle and /door count - It does, it stays.
if(src.icon_state in list("wall1", "wall", "diagonalWall", "wall_floor", "wall_space")) //so wizard den, syndie shuttle etc will remain black
for(var/turf/simulated/shuttle/wall/W in range(src,1))
W.relativewall()
..()
..()*/
/turf/simulated/wall/Del()
@@ -136,7 +136,7 @@
..()
/turf/simulated/shuttle/wall/Del()
/*/turf/simulated/shuttle/wall/Del()
var/temploc = src.loc
@@ -144,4 +144,4 @@
for(var/turf/simulated/shuttle/wall/W in range(temploc,1))
W.relativewall()
..()
..()*/