cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 12:43:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Nerfs abandoned crates to be less fucking moronic.

Browse Source
This commit is contained in:
Zuhayr
2014-01-02 00:42:11 +10:30
parent 1cddbeb180
commit 37d96ebc80
2 changed files with 23 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
code/modules/mining/abandonedcrates.dm
View File

@@ -24,64 +24,45 @@
if(2) if(2)
new/obj/item/weapon/pickaxe/drill(src) new/obj/item/weapon/pickaxe/drill(src)
new/obj/item/device/taperecorder(src) new/obj/item/device/taperecorder(src)
new/obj/item/clothing/suit/space/rig(src) new/obj/item/clothing/suit/space(src)
new/obj/item/clothing/head/helmet/space/rig(src) new/obj/item/clothing/head/helmet/space(src)
if(3) if(3)
for(var/i = 0, i < 12, i++) return
new/obj/item/weapon/coin/diamond(src)
if(4) if(4)
new/obj/item/weapon/bananapeel(src)
if(5)
for(var/i = 0, i < 6, i++)
new/obj/item/weapon/reagent_containers/food/snacks/sliceable/birthdaycake(src)
new/obj/item/weapon/lighter/zippo(src)
if(7)
new/obj/item/weapon/reagent_containers/glass/beaker/bluespace(src) new/obj/item/weapon/reagent_containers/glass/beaker/bluespace(src)
if(9 to 10) if(5 to 6)
for(var/i = 0, i < 10, i++) for(var/i = 0, i < 10, i++)
new/obj/item/weapon/ore/diamond(src) new/obj/item/weapon/ore/diamond(src)
if(11) if(7)
return return
if(12) if(8)
new/obj/item/seeds/deathberryseed(src) return
new/obj/item/seeds/deathnettleseed(src) if(9)
if(13) for(var/i = 0, i < 3, i++)
new/obj/machinery/hydroponics(src) new/obj/machinery/hydroponics(src)
if(14) if(10)
new/obj/item/seeds/cashseed(src)
if(15)
for(var/i = 0, i < 3, i++) for(var/i = 0, i < 3, i++)
new/obj/item/weapon/reagent_containers/glass/beaker/noreact(src) new/obj/item/weapon/reagent_containers/glass/beaker/noreact(src)
if(16 to 17) if(11 to 12)
for(var/i = 0, i < 9, i++) for(var/i = 0, i < 9, i++)
new/obj/item/bluespace_crystal(src) new/obj/item/bluespace_crystal(src)
if(19) if(13)
for(var/i = 0, i < 4, i++)
new/obj/item/weapon/melee/classic_baton(src) new/obj/item/weapon/melee/classic_baton(src)
if(20) if(14)
new/obj/item/weapon/storage/lockbox/clusterbang(src) return
if(21) if(15)
new/obj/item/weapon/aiModule/robocop(src)
if(22)
new/obj/item/clothing/under/chameleon(src) new/obj/item/clothing/under/chameleon(src)
for(var/i = 0, i < 7, i++) for(var/i = 0, i < 7, i++)
new/obj/item/clothing/tie/horrible(src) new/obj/item/clothing/tie/horrible(src)
if(23) if(16)
new/obj/item/clothing/under/shorts(src) new/obj/item/clothing/under/shorts(src)
new/obj/item/clothing/under/shorts/red(src) new/obj/item/clothing/under/shorts/red(src)
new/obj/item/clothing/under/shorts/blue(src) new/obj/item/clothing/under/shorts/blue(src)
//Dummy crates start here. //Dummy crates start here.
if(24 to 29) if(17 to 29)
return
if(8)
return
if(6)
return
if(18)
return return
//Dummy crates end here. //Dummy crates end here.
if(30) if(30)
for(var/i = 0, i < 4, i++)
new/obj/item/weapon/melee/baton(src) new/obj/item/weapon/melee/baton(src)
/obj/structure/closet/crate/secure/loot/attack_hand(mob/user as mob) /obj/structure/closet/crate/secure/loot/attack_hand(mob/user as mob)
@@ -102,7 +83,7 @@
if (attempts == 0) if (attempts == 0)
user << "<span class='danger'>The crate's anti-tamper system activates!</span>" user << "<span class='danger'>The crate's anti-tamper system activates!</span>"
var/turf/T = get_turf(src.loc) var/turf/T = get_turf(src.loc)
explosion(T, 0, 1, 2, 1) explosion(T, 0, 0, 0, 1)
del(src) del(src)
return return
else else
@@ -131,3 +112,4 @@
else else
user << "<span class='notice'>* Last access attempt higher than expected code.</span>" user << "<span class='notice'>* Last access attempt higher than expected code.</span>"
else ..() else ..()
else ..()

2
code/modules/mining/mine_turfs.dm
View File

@@ -487,7 +487,7 @@ commented out in r5061, I left it because of the shroom thingies
var/turf/simulated/floor/plating/airless/asteroid/N = ChangeTurf(/turf/simulated/floor/plating/airless/asteroid) var/turf/simulated/floor/plating/airless/asteroid/N = ChangeTurf(/turf/simulated/floor/plating/airless/asteroid)
N.fullUpdateMineralOverlays() N.fullUpdateMineralOverlays()
var/crate = rand(1,30) var/crate = rand(1,500)
switch(crate) switch(crate)
if(1) if(1)
visible_message("<span class='notice'>After digging, you find an old dusty crate buried within!</span>") visible_message("<span class='notice'>After digging, you find an old dusty crate buried within!</span>")