cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-30 20:13:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some foreign legion fixes. (#5874)

Browse Source
This commit is contained in:
Alberyk
2018-12-30 22:01:25 -02:00
committed by Werner
parent 8602481863
commit 746772f1c1
4 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/clothing/under/accessories/accessory.dm
View File

@@ -335,7 +335,6 @@
icon_state = "classicponcho"
item_state = "classicponcho"
icon_override = 'icons/mob/ties.dmi'
var/fire_resist = T0C+100
allowed = list(/obj/item/weapon/tank/emergency_oxygen)
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
slot_flags = SLOT_OCLOTHING | SLOT_TIE
@@ -509,6 +508,7 @@
desc = "A ribbon meant to attach to the chest and sling around the shoulder accompanied by two medallions, marking seniority in a Tau Ceti Foreign Legion."
icon_state = "senior_ribbon"
item_state = "senior_ribbon"
slot = "over"
/obj/item/clothing/accessory/legion/specialist
name = "specialist medallion"

4
code/modules/vehicles/droppod.dm
View File

@@ -11,7 +11,7 @@
fire_dam_coeff = 0.6
brute_dam_coeff = 0.5
var/list/validfirelocations = list(7) // 7 Is above the station.
var/list/validfirelocations = list(1, 7) // above the station and at the centcomm z-level.
var/used = 0
@@ -39,7 +39,7 @@
/obj/vehicle/droppod/load(var/mob/C) // this won't call the parent proc due to the differences and the fact it doesn't use load. Also only mobs can be loaded.
if(!ismob(C))
return 0
if(!isturf(C.loc))
if(!isturf(C.loc))
return 0
if((humanload && passenger) || C.anchored)
return 0