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

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

Browse Source 
Conflicts:
	code/game/jobs/job/support.dm
	code/setup.dm
This commit is contained in:
Markolie
2015-02-22 19:12:11 +01:00
parent 982102a407 1f5ef8d4dd
commit 72db213067
68 changed files with 566 additions and 522 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/medical.dm
+7 -11
View File
@@ -19,17 +19,13 @@
user << "<span class='danger'>You don't have the dexterity to do this!</span>"
return 1
if (istype(M, /mob/living/carbon/human))
var/mob/living/carbon/human/H = M
var/datum/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
if(affecting.display_name == "head")
if(H.head && istype(H.head,/obj/item/clothing/head/helmet/space))
user << "<span class='danger'>You can't apply [src] through [H.head]!</span>"
return 1
else
if(H.wear_suit && istype(H.wear_suit,/obj/item/clothing/suit/space))
user << "<span class='danger'>You can't apply [src] through [H.wear_suit]!</span>"
if(isliving(M))
if(!M.can_inject(user, 1))
return 1
if(affecting.status & ORGAN_ROBOT)
@@ -48,7 +44,7 @@
use(1)
M.updatehealth()
/obj/item/stack/medical/bruise_pack
name = "roll of gauze"
singular_name = "gauze length"
@@ -82,12 +78,12 @@
user.visible_message( "\blue [user] places a bandaid over \the [W.desc] on [M]'s [affecting.display_name].", \
"\blue You place a bandaid over \the [W.desc] on [M]'s [affecting.display_name]." )
affecting.heal_damage(src.heal_brute, src.heal_burn, 0)
affecting.heal_damage(src.heal_brute, src.heal_burn, 0)
use(1)
else
M.heal_organ_damage((src.heal_brute/2), (src.heal_burn/2))
use(1)
/obj/item/stack/medical/ointment
name = "ointment"
desc = "Used to treat those nasty burns."
@@ -112,7 +108,7 @@
else
user.visible_message( "\blue [user] salves the wounds on [M]'s [affecting.display_name].", \
"\blue You salve the wounds on [M]'s [affecting.display_name]." )
affecting.heal_damage(src.heal_brute, src.heal_burn, 0)
affecting.heal_damage(src.heal_brute, src.heal_burn, 0)
use(1)
else
if (can_operate(H)) //Checks if mob is lying down on table for surgery
code/game/objects/items/weapons/manuals.dm
+1 -1
View File
@@ -673,7 +673,7 @@
</head>
<body>
<iframe width='100%' height='97%' src="http://nanotrasen.se/wiki/index.php?title=Space_law&printable=yes" frameborder="0" id="main_frame"></iframe> </body>
<iframe width='100%' height='97%' src="http://nanotrasen.se/wiki/index.php?title=Space_Law&printable=yes" frameborder="0" id="main_frame"></iframe> </body>
</html>
code/game/objects/items/weapons/melee/energy.dm
+1 -1
View File
@@ -50,7 +50,7 @@
edge = 1
/obj/item/weapon/melee/energy/sword/cyborg
var/hitcost = 500
var/hitcost = 250
/obj/item/weapon/melee/energy/sword/cyborg/attack(mob/M, var/mob/living/silicon/robot/R)
if(R.cell)
code/game/objects/items/weapons/power_cells.dm
+16
View File
@@ -119,3 +119,19 @@
rating = 3
m_amt = 0
g_amt = 0
/obj/item/weapon/stock_parts/cell/emproof
name = "\improper EMP-proof cell"
desc = "An EMP-proof cell."
maxcharge = 5000
rating = 2
/obj/item/weapon/stock_parts/cell/emproof/empty/New()
..()
charge = 0
/obj/item/weapon/stock_parts/cell/emproof/emp_act(severity)
return
/obj/item/weapon/stock_parts/cell/emproof/corrupt()
return
code/game/objects/items/weapons/storage/uplink_kits.dm
+1 -1
View File
@@ -12,7 +12,7 @@
if("stealth")
new /obj/item/weapon/gun/energy/kinetic_accelerator/crossbow(src)
new /obj/item/weapon/pen/paralysis(src)
new /obj/item/weapon/pen/sleepy(src)
new /obj/item/device/chameleon(src)
return
code/game/objects/structures/crates_lockers/closets/syndicate.dm
+4 -3
View File
@@ -13,8 +13,7 @@
..()
sleep(2)
new /obj/item/clothing/under/syndicate(src)
new /obj/item/clothing/suit/armor/vest(src)
new /obj/item/clothing/head/helmet/swat/syndicate(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/ammo_box/magazine/m10mm(src)
new /obj/item/weapon/storage/belt/military(src)
new /obj/item/weapon/crowbar/red(src)
@@ -26,8 +25,10 @@
/obj/structure/closet/syndicate/suits/New()
..()
sleep(2)
new /obj/item/weapon/tank/jetpack/oxygen/harness(src)
new /obj/item/clothing/head/helmet/space/rig/syndi(src)
new /obj/item/clothing/mask/gas/syndicate(src)
new /obj/item/clothing/suit/space/rig/syndi(src)
new /obj/item/weapon/tank/jetpack/oxygen/harness(src)
new /obj/item/clothing/shoes/magboots/syndie(src)
/obj/structure/closet/syndicate/nuclear