cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 00:29:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

when u forget to pull for updates before touching a .dmi

Browse Source
This commit is contained in:
MMMiracles
2016-05-07 01:35:22 -04:00
parent 1f4c7857bc 2dc2c3e047
commit 923aa61501
349 changed files with 5879 additions and 3058 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/abandoned_crates.dm
+3 -3
View File
@@ -106,11 +106,11 @@
if(87) //1% chance
new /obj/item/weed_extract(src)
if(88)
new /obj/item/organ/internal/brain(src)
new /obj/item/organ/brain(src)
if(89)
new /obj/item/organ/internal/brain/alien(src)
new /obj/item/organ/brain/alien(src)
if(90)
new /obj/item/organ/internal/heart(src)
new /obj/item/organ/heart(src)
if(91)
new /obj/item/device/soulstone/anybody(src)
if(92)
code/modules/mining/equipment_locker.dm
+3 -3
View File
@@ -1072,9 +1072,9 @@
w_class = 1
origin_tech = "biotech=1"
/obj/item/weapon/hivelordstabilizer/afterattack(obj/item/organ/internal/M, mob/user)
var/obj/item/organ/internal/hivelord_core/C = M
if(!istype(C, /obj/item/organ/internal/hivelord_core))
/obj/item/weapon/hivelordstabilizer/afterattack(obj/item/organ/M, mob/user)
var/obj/item/organ/hivelord_core/C = M
if(!istype(C, /obj/item/organ/hivelord_core))
user << "<span class='warning'>The stabilizer only works on certain types of monster organs, generally regenerative in nature.</span>"
return ..()
C.preserved = 1
code/modules/mining/lavaland/necropolis_chests.dm
+16 -3
View File
@@ -32,11 +32,11 @@
new /obj/item/clothing/suit/cultrobes(src)
new /obj/item/weapon/bedsheet/cult(src)
if(9)
new /obj/item/organ/internal/brain/alien(src)
new /obj/item/organ/brain/alien(src)
if(10)
new /obj/item/organ/internal/heart/cursed(src)
new /obj/item/organ/heart/cursed(src)
if(11)
new /obj/vehicle/lavaboat/dragon(src)
new /obj/item/ship_in_a_bottle(src)
if(12)
new /obj/item/clothing/suit/space/hardsuit/ert/paranormal/beserker(src)
if(13)
@@ -384,6 +384,19 @@
//Dragon Boat
/obj/item/ship_in_a_bottle
name = "ship in a bottle"
desc = "A tiny ship inside a bottle."
icon = 'icons/obj/lavaland/artefacts.dmi'
icon_state = "ship_bottle"
/obj/item/ship_in_a_bottle/attack_self(mob/user)
user << "You're not sure how they get the ships in these things, but you're pretty sure you know how to get it out."
playsound(user.loc, 'sound/effects/Glassbr1.ogg', 100, 1)
new /obj/vehicle/lavaboat/dragon(get_turf(src))
qdel(src)
/obj/vehicle/lavaboat/dragon
name = "mysterious boat"
desc = "This boat moves where you will it, without the need for an oar."