cyberpresidentvanellope/Aurora-Old
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora-Old.git synced 2026-08-24 13:16:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #368 from Meowykins/master

Browse Source 
Minor changes/additions
This commit is contained in:
skull132
2015-02-15 21:05:53 +02:00
parent f8c3960aad 222052e5ba
commit d00d3a3216
11 changed files with 139 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/gloves/color.dm
+11 -1
View File
@@ -132,4 +132,14 @@
siemens_coefficient = 0
permeability_coefficient = 0.05
item_color="yellow"
species_restricted = list("Unathi")
species_restricted = list("Unathi")
/obj/item/clothing/gloves/black/unathi
name = "black gloves"
desc = "black gloves made for Unathi use."
species_restricted = list("Unathi")
/obj/item/clothing/gloves/black/tajara
name = "black gloves"
desc = "black gloves made for Tajara use."
species_restricted = list("Tajaran")
code/modules/clothing/gloves/miscellaneous.dm
+11
View File
@@ -53,6 +53,16 @@
cmo
item_color = "medical" //Exists for washing machines. Is not different from latex gloves in any way.
/obj/item/clothing/gloves/latex/unathi
name = "unathi latex gloves"
desc = "Sterile latex gloves. Designed for Unathi use."
species_restricted = list("Unathi")
/obj/item/clothing/gloves/latex/tajara
name = "tajara latex gloves"
desc = "Sterile latex gloves. Designed for Tajara use."
species_restricted = list("Tajaran")
/obj/item/clothing/gloves/botanic_leather
desc = "These leather gloves protect against thorns, barbs, prickles, spikes and other harmful objects of floral origin."
name = "botanist's leather gloves"
@@ -68,6 +78,7 @@
item_state = "watchgloves"
w_class = 1
wired = 1
species_restricted = list()
// var/time = 1
verb/checktime()
code/modules/clothing/head/helmet.dm
+12 -7
View File
@@ -6,10 +6,6 @@
item_state = "helmet"
armor = list(melee = 50, bullet = 15, laser = 50,energy = 10, bomb = 25, bio = 0, rad = 0)
flags_inv = HIDEEARS|HIDEEYES
cold_protection = HEAD
min_cold_protection_temperature = HELMET_MIN_COLD_PROTECTION_TEMPERATURE
heat_protection = HEAD
max_heat_protection_temperature = HELMET_MAX_HEAT_PROTECTION_TEMPERATURE
siemens_coefficient = 0.7
w_class = 3
@@ -44,7 +40,6 @@
armor = list(melee = 80, bullet = 60, laser = 50,energy = 25, bomb = 50, bio = 10, rad = 0)
flags_inv = HIDEEARS|HIDEEYES
cold_protection = HEAD
min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE
siemens_coefficient = 0.5
/obj/item/clothing/head/helmet/thunderdome
@@ -55,7 +50,6 @@
item_state = "thunderdome"
armor = list(melee = 80, bullet = 60, laser = 50,energy = 10, bomb = 25, bio = 10, rad = 0)
cold_protection = HEAD
min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE
siemens_coefficient = 1
/obj/item/clothing/head/helmet/gladiator
@@ -75,4 +69,15 @@
flags = FPRINT|TABLEPASS|HEADCOVERSEYES
armor = list(melee = 62, bullet = 50, laser = 50,energy = 35, bomb = 10, bio = 2, rad = 0)
flags_inv = HIDEEARS
siemens_coefficient = 0.7
siemens_coefficient = 0.7
/obj/item/clothing/head/helmet/space // For spacesuit helmets. Removing the protection from the base helmets appears to have fucked them. Fixed with this, I believe.
name = "spaceasshole helmet"
desc = "shouldn't be able to see this"
icon_state = "n/a"
item_state = "n/a"
flags_inv = HIDEEARS|HIDEEYES
cold_protection = HEAD
min_cold_protection_temperature = HELMET_MIN_COLD_PROTECTION_TEMPERATURE
heat_protection = HEAD
max_heat_protection_temperature = HELMET_MAX_HEAT_PROTECTION_TEMPERATURE
code/modules/mob/holder.dm
+28
View File
@@ -71,6 +71,34 @@
icon_state = "cat"
origin_tech = null
// Fuck the mice and their shitty fucking colors - Morgan
/obj/item/weapon/holder/mouse/gray
name = "mouse"
desc = "It's a mouse. Squeak."
icon_state = "mouse_gray"
origin_tech = null
/obj/item/weapon/holder/mouse/white
name = "mouse"
desc = "It's a mouse. Squeak."
icon_state = "mouse_white"
origin_tech = null
/obj/item/weapon/holder/mouse/brown
name = "mouse"
desc = "It's a mouse. Squeak."
icon_state = "mouse_brown"
origin_tech = null
// End shitty mouse section - Morgan
/obj/item/weapon/holder/lizard
name = "lizard"
desc = "It's a lizard. Keep Phoebe away."
icon_state = "lizard"
origin_tech = null
/obj/item/weapon/holder/borer
name = "cortical borer"
desc = "It's a slimy brain slug. Gross."
code/modules/mob/living/living.dm
+4 -1
View File
@@ -801,7 +801,10 @@
return
for(var/mob/O in viewers(src, null))
O.show_message(text("<B>[src] scrambles into the ventillation ducts!</B>"), 1)
if(mind.changeling)
O.show_message(text("<B>\red [src] twists their body into a vile form, bones cracking and popping as its tiny body contorts into a mass of distorted limbs, quickly forcing their way through the vent!</B>"), 1)
else
O.show_message(text("<B>[src] scrambles into the ventillation ducts!</B>"), 1)
loc = target_vent
var/travel_time = round(get_dist(loc, target_vent.loc) / 2)
code/modules/mob/living/simple_animal/friendly/lizard.dm
+13 -1
View File
@@ -15,4 +15,16 @@
melee_damage_upper = 2
response_help = "pets"
response_disarm = "shoos"
response_harm = "stomps on"
response_harm = "stomps on"
holder_type = /obj/item/weapon/holder/lizard
/mob/living/simple_animal/lizard/MouseDrop(atom/over_object)
var/mob/living/carbon/H = over_object
if(!istype(H)) return ..()
if(H.a_intent == "help")
get_scooped(H)
return
else
return ..()
code/modules/mob/living/simple_animal/friendly/mouse.dm
+16
View File
@@ -28,6 +28,7 @@
maxbodytemp = 323 //Above 50 Degrees Celcius
universal_speak = 0
universal_understand = 1
holder_type = null
/mob/living/simple_animal/mouse/Life()
..()
@@ -90,6 +91,17 @@
client.time_died_as_mouse = world.time
..()
/mob/living/simple_animal/mouse/MouseDrop(atom/over_object)
var/mob/living/carbon/H = over_object
if(!istype(H)) return ..()
if(H.a_intent == "help")
get_scooped(H)
return
else
return ..()
/*
* Mouse types
*/
@@ -97,14 +109,18 @@
/mob/living/simple_animal/mouse/white
body_color = "white"
icon_state = "mouse_white"
holder_type = /obj/item/weapon/holder/mouse/white
/mob/living/simple_animal/mouse/gray
body_color = "gray"
icon_state = "mouse_gray"
holder_type = /obj/item/weapon/holder/mouse/gray
/mob/living/simple_animal/mouse/brown
body_color = "brown"
icon_state = "mouse_brown"
holder_type = /obj/item/weapon/holder/mouse/brown
//TOM IS ALIVE! SQUEEEEEEEE~K :)
/mob/living/simple_animal/mouse/brown/Tom
code/modules/reagents/Chemistry-Reagents.dm
+7 -4
View File
@@ -2357,7 +2357,10 @@ datum
eyes_covered = 1
if ( !safe_thing )
safe_thing = victim.glasses
if ( eyes_covered && mouth_covered )
if(!(victim.species && !(victim.species.flags & IS_SYNTHETIC)))
victim << "\red your screen gets covered in some kind of spray."
return
else if ( eyes_covered && mouth_covered )
victim << "\red Your [safe_thing] protects you from the pepperspray!"
return
else if ( eyes_covered ) // Reduced effects if partially protected
@@ -2371,12 +2374,12 @@ datum
return
else if ( mouth_covered ) // Mouth cover is better than eye cover
victim << "\red Your [safe_thing] protects your face from the pepperspray!"
if (!(victim.species && (victim.species.flags & NO_PAIN)))
if (!(victim.species && (victim.species.flags & IS_PLANT)))
victim.emote("scream")
victim.eye_blurry = max(M.eye_blurry, 5)
return
else // Oh dear :D
if (!(victim.species && (victim.species.flags & NO_PAIN)))
else // Oh dear :D < - No idea what that's about. Looks like this is for unprotected people? The weird this is, it affects IPCs, because they have the no_pain flag. Might have a fix.
if (!(victim.species && (victim.species.flags & IS_PLANT)))
victim.emote("scream")
victim << "\red You're sprayed directly in the eyes with pepperspray!"
victim.eye_blurry = max(M.eye_blurry, 25)