Skip to content

Commit

Permalink
Hotfix for release (PolarisSS13#596)
Browse files Browse the repository at this point in the history
* Gives races sprites for new hazmat & const V.suit

Gives them the closest placeholder sprites I could give.
Gave them default const/hazmat voidsuit, tajaran, or
unathi depending on what would fit best

* Allow the excavation drill to actually mine 30cm as advertised

* Fixes contraband maybe for real this time (PolarisSS13#588)

* Fixes contraband crate

* Fixes contraband maybe for real this time

* wrong name

* Add additional language whitelists (PolarisSS13#591)

* release_all_contents now cancels if belly is empty (PolarisSS13#592)

* Animals can no longer eat people when dead (PolarisSS13#594)
  • Loading branch information
SpadesNeil committed Sep 25, 2016
1 parent b896633 commit 9506bb7
Show file tree
Hide file tree
Showing 17 changed files with 15 additions and 7 deletions.
9 changes: 4 additions & 5 deletions code/datums/supplypacks/contraband_vr.dm
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
/datum/supply_packs/stolen
name = "Stolen supplies"
contains = list(/obj/item/stolenpackage)
/datum/supply_packs/supply/stolen
name = "Stolen supply crate"
contains = list(/obj/item/stolenpackage = 1)
cost = 150
containertype = /obj/structure/closet/crate
containername = "Stolen crate"
contraband = 1
group = "Supplies"
contraband = 1
5 changes: 5 additions & 0 deletions code/modules/mob/language/station_vr.dm
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,8 @@
flags = 0
/datum/language/seromi
flags = 0
/datum/language/gutter
flags = WHITELISTED
/datum/language/machine
flags = NO_STUTTER | WHITELISTED

2 changes: 2 additions & 0 deletions code/modules/vore/eating/belly_vr.dm
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@
// If that location is another mob, contents are transferred into whichever of its bellies the owning mob is in.
// Returns the number of mobs so released.
/datum/belly/proc/release_all_contents()
if (internal_contents.len == 0)
return 0
for (var/atom/movable/M in internal_contents)
if(istype(M,/mob/living))
var/mob/living/ML = M
Expand Down
2 changes: 2 additions & 0 deletions code/modules/vore/eating/simple_animal_vr.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
set category = "Vore"
set desc = "Since you can't grab, you get a verb!"

if (stat != CONSCIOUS)
return
feed_grabbed_to_self(src,T)

//
Expand Down
4 changes: 2 additions & 2 deletions code/modules/xenoarcheaology/tools/tools_pickaxe_vr.dm
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@
if(depth>30 || depth<1)
user << "<span class='notice'>Invalid depth.</span>"
return
excavation_amount = depth/2
excavation_amount = depth
user << "<span class='notice'>You set the depth to [depth]cm.</span>"

/obj/item/weapon/pickaxe/excavationdrill/examine(mob/user)
..()
var/depth = excavation_amount*2
var/depth = excavation_amount
user << "<span class='info'>It is currently set at [depth]cms.</span>"
Binary file modified icons/mob/species/akula/helmet_vr.dmi
Binary file not shown.
Binary file modified icons/mob/species/akula/suit_vr.dmi
Binary file not shown.
Binary file modified icons/mob/species/fennec/helmet_vr.dmi
Binary file not shown.
Binary file modified icons/mob/species/fennec/suit_vr.dmi
Binary file not shown.
Binary file modified icons/mob/species/fox/helmet_vr.dmi
Binary file not shown.
Binary file modified icons/mob/species/fox/suit_vr.dmi
Binary file not shown.
Binary file modified icons/mob/species/nevrean/helmet_vr.dmi
Binary file not shown.
Binary file modified icons/mob/species/nevrean/suit_vr.dmi
Binary file not shown.
Binary file modified icons/mob/species/sergal/helmet_vr.dmi
Binary file not shown.
Binary file modified icons/mob/species/sergal/suit_vr.dmi
Binary file not shown.
Binary file modified icons/mob/species/vulpkanin/helmet.dmi
Binary file not shown.
Binary file modified icons/mob/species/vulpkanin/suit.dmi
Binary file not shown.

0 comments on commit 9506bb7

Please sign in to comment.