cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-26 10:03:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a unused area in Cryo.

Browse Source 
Removed damaging effects to alien players. C'mon, we whitelist them already!
This commit is contained in:
Hawk_v3
2012-10-28 10:28:12 +00:00
parent 8e877047d9
commit b64a1cfe69
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/game/machinery/cryo.dm
View File

@@ -181,9 +181,9 @@
/obj/machinery/atmospherics/unary/cryo_cell/proc/expel_gas()
if(air_contents.total_moles() < 1)
return
var/datum/gas_mixture/expel_gas = new
var/remove_amount = air_contents.total_moles()/50
expel_gas = air_contents.remove(remove_amount)
// var/datum/gas_mixture/expel_gas = new
// var/remove_amount = air_contents.total_moles()/50
// expel_gas = air_contents.remove(remove_amount)
// Just have the gas disappear to nowhere.
//expel_gas.temperature = T20C // Lets expel hot gas and see if that helps people not die as they are removed

34
code/modules/mob/living/carbon/human/inventory.dm
View File

@@ -181,8 +181,8 @@
src.r_hand = null
update_inv_r_hand()
//check later on if our species can't wear some clothes
var/cur_species = get_species()
//check later on if our species can't wear some clothes. Hawk: Bugger that. Just tell them in the roundstart messages! We whitelist them!
// var/cur_species = get_species()
W.loc = src
switch(slot)
@@ -228,8 +228,8 @@
W.equipped(src, slot)
update_inv_glasses(redraw_mob)
if(slot_gloves)
var/broken = 0
if(cur_species == "Tajaran")
/* var/broken = 0
if(cur_species == "Tajaran") //We whitelist our Tajaran already. No further code is needed to punish them.
if(prob(5))
src.visible_message("\red Your feet burst out of the [W], ripping them to shreds!", "\red [src]'s feet burst out of the [W], ripping them to shreds!", "\red You hear a ripping, tearing sound!")
apply_damage(5)
@@ -239,10 +239,10 @@
else if(prob(50))
src << "\red You hurt your feet forcing them into the [W]!"
apply_damage(5)
if(!broken)
src.gloves = W
W.equipped(src, slot)
update_inv_gloves(redraw_mob)
if(!broken)*/
src.gloves = W
W.equipped(src, slot)
update_inv_gloves(redraw_mob)
if(slot_head)
src.head = W
if(head.flags & BLOCKHAIR)
@@ -252,7 +252,7 @@
W.equipped(src, slot)
update_inv_head(redraw_mob)
if(slot_shoes)
var/broken = 0
/* var/broken = 0
if(cur_species == "Tajaran")
if(prob(5))
src.visible_message("\red Your feet burst out of the [W], ripping them to shreds!", "\red [src]'s feet burst out of the [W], ripping them to shreds!", "\red You hear a ripping, tearing sound!")
@@ -263,10 +263,10 @@
else if(prob(50))
src << "\red You hurt your feet forcing them into the [W]!"
apply_damage(5)
if(!broken)
src.shoes = W
W.equipped(src, slot)
update_inv_shoes(redraw_mob)
if(!broken) */
src.shoes = W
W.equipped(src, slot)
update_inv_shoes(redraw_mob)
if(slot_wear_suit)
src.wear_suit = W
W.equipped(src, slot)
@@ -295,8 +295,8 @@
src << "\red You are trying to eqip this item to an unsupported inventory slot. How the heck did you manage that? Stop it..."
return
//can't quite fit some alien bodyparts
/*
//can't quite fit some alien bodyparts. Hawk: For the love of god why?
if( W.body_parts_covered & LOWER_TORSO && W.flags_inv & HIDEJUMPSUIT && (cur_species == "Tajaran" || cur_species == "Soghun"))
if(prob(50))
src << "\red You twist your tail trying to fit it in!"
@@ -305,7 +305,7 @@
if(prob(50))
src << "\red You twist your eartails trying to fit it in!"
apply_damage(5)
*/
W.layer = 20
return
@@ -666,4 +666,4 @@ It can still be worn/put on as normal.
if(source && target)
if(source.machine == target)
target.show_inv(source)
del(src)
del(src)