Skip to content

Commit

Permalink
Late September Release (#567)
Browse files Browse the repository at this point in the history 
* Fixes ZAS issues on away maps (#558)

Fixes ZAS issues on away maps

* Blood loss nerf (#553)

PolarisSS13/Polaris#2470

* Fixes large carp not moving in space. I think. (#557)

#556

* Adjusting some fluff items and adding in the security train for testing and further coding. (#560)

* Vulpkanin chest sprite tweaks (#562)

* Cyborgs can no longer use OOC resize (#566)

* Contraband Update (#564)

* Adds bird mobs (#563)

* Adds birbs

Sprites from Goonstation

* micros should be ate

* Forgot to remove editing lines

* Adds a bird crate to cargo.

Since crates can only have one animal in them at any given time, I had
to make a hack to make it spawn multiple birds at once.

* Update hydroponics_vr.dm

* Map hotfix (#568)
  • Loading branch information
@SpadesNeil
SpadesNeil committed Sep 19, 2016
1 parent cb17859 commit 9da17a2
Show file tree
Hide file tree
Showing 28 changed files with 1,619 additions and 498 deletions.
7 changes: 7 additions & 0 deletions code/datums/supplypacks/contraband_vr.dm
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/datum/supply_packs/stolen
name = "Stolen supplies"
contains = list(/obj/item/stolenpackage)
cost = 150
containertype = /obj/structure/closet/crate
containername = "Stolen crate"
contraband = 1
6 changes: 6 additions & 0 deletions code/datums/supplypacks/hydroponics_vr.dm
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/datum/supply_packs/hydro/goat
name = "Birds Crate"
cost = 200 //You're getting 22 birds. Of course it's going to be a lot!
containertype = /obj/structure/largecrate/birds
containername = "Bird crate"
access = access_hydroponics
87 changes: 87 additions & 0 deletions code/game/objects/items/contraband_vr.dm
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
/obj/item/stolenpackage
name = "stolen package"
desc = "What's in the box?"
icon = 'icons/obj/storage.dmi'
icon_state = "deliverycrate4"
item_state = "table_parts"
w_class = 5

attack_self(mob/user as mob)
// Another way of doing this. Commented out because the other method is better for this application.
/*var/spawn_chance = rand(1,100)
switch(spawn_chance)
if(0 to 49)
new /obj/random/gun/guarenteed(usr.loc)
usr << "You got a thing!"
if(50 to 99)
new /obj/item/weapon/bikehorn/rubberducky(usr.loc)
new /obj/item/weapon/bikehorn(usr.loc)
usr << "You got two things!"
if(100)
usr << "The box contained nothing!"
return
*/
var/loot = pick(/obj/random/contraband,
/obj/random/contraband,
/obj/item/weapon/book/manual/engineering_hacking,
/obj/item/device/chameleon,
/obj/item/weapon/contraband/poster,
/obj/item/seeds/ambrosiadeusseed,
/obj/item/seeds/ambrosiavulgarisseed,
/obj/item/seeds/libertymycelium,
/obj/item/xenos_claw,
/obj/item/weapon/reagent_containers/food/snacks/xenomeat,
/obj/item/weapon/reagent_containers/food/snacks/clownstears,
/obj/item/weapon/reagent_containers/food/snacks/carpmeat,
/obj/item/clothing/glasses/thermal,
/obj/item/clothing/gloves/combat,
/obj/item/clothing/head/bearpelt,
/obj/item/clothing/mask/balaclava,
/obj/item/weapon/storage/fancy/cigar/havana,
/obj/item/clothing/mask/horsehead,
/obj/item/clothing/mask/muzzle,
/obj/item/weapon/storage/toolbox/syndicate,
/obj/item/weapon/stamp/centcomm,
/obj/item/weapon/stamp/solgov,
/obj/item/weapon/storage/bible/booze,
/obj/item/weapon/pen/reagent/paralysis,
/obj/item/weapon/grenade/flashbang/clusterbang,
/obj/item/weapon/reagent_containers/food/drinks/bottle/pwine,
/obj/item/weapon/reagent_containers/glass/beaker/neurotoxin,
/obj/item/weapon/grenade/flashbang/clusterbang,
/obj/item/weapon/grenade/spawnergrenade/spesscarp,
/obj/item/weapon/card/emag,
/obj/item/weapon/card/emag_broken,
/obj/item/device/pda/syndicate,
/obj/item/weapon/shield/energy,
/obj/item/weapon/melee/energy/sword,
/obj/item/weapon/melee/telebaton,
/obj/item/weapon/melee/classic_baton,
/obj/item/clothing/suit/armor/heavy,
/obj/item/clothing/suit/armor/vest,
/obj/item/clothing/suit/armor/laserproof,
/obj/random/weapon/guarenteed,
/obj/item/weapon/material/knuckledusters,
/obj/effect/landmark/costume,
/obj/item/mecha_parts/chassis/phazon,
/obj/item/mecha_parts/part/phazon_torso,
/obj/item/mecha_parts/part/phazon_head,
/obj/item/mecha_parts/part/phazon_left_arm,
/obj/item/mecha_parts/part/phazon_right_arm,
/obj/item/mecha_parts/part/phazon_left_leg,
/obj/item/mecha_parts/part/phazon_right_leg)
new loot(usr.loc)
usr << "You unwrap the package."
del(src)

/obj/item/weapon/storage/fancy/cigar/havana // Putting this here 'cuz fuck it. -Spades
name = "\improper Havana cigar case"
desc = "Save these for the fancy-pantses at the next CentCom black tie reception. You can't blow the smoke from such majestic stogies in just anyone's face."
icon_state = "cigarcase"
icon = 'icons/obj/cigarettes.dmi'
w_class = 1
throwforce = 2
slot_flags = SLOT_BELT
storage_slots = 7
can_hold = list(/obj/item/clothing/mask/smokable/cigarette/cigar/havana)
icon_type = "cigar"
4 changes: 2 additions & 2 deletions code/game/objects/items/devices/PDA/PDA.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,8 @@ var/global/list/obj/item/device/pda/PDAs = list()
/obj/item/device/pda/syndicate
default_cartridge = /obj/item/weapon/cartridge/syndicate
icon_state = "pda-syn"
name = "Military PDA"
owner = "John Doe"
// name = "Military PDA" // Vorestation Edit
// owner = "John Doe"
hidden = 1

/obj/item/device/pda/chaplain
Expand Down
126 changes: 126 additions & 0 deletions code/game/objects/random/random_vr.dm
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
/obj/random/weapon // For Gateway maps and Syndicate. Can possibly spawn almost any gun in the game.
name = "Random Illegal Weapon"
desc = "This is a random illegal weapon."
icon = 'icons/obj/gun.dmi'
icon_state = "p08"
spawn_nothing_percentage = 50
item_to_spawn()
return pick(prob(11);/obj/random/ammo_all,\
prob(11);/obj/item/weapon/gun/energy/laser,\
prob(11);/obj/item/weapon/gun/projectile/pirate,\
prob(10);/obj/item/weapon/material/twohanded/spear,\
prob(10);/obj/item/weapon/gun/energy/stunrevolver,\
prob(10);/obj/item/weapon/gun/energy/taser,\
prob(10);/obj/item/weapon/gun/launcher/crossbow,\
prob(10);/obj/item/weapon/gun/projectile/shotgun/doublebarrel/pellet,\
prob(10);/obj/item/weapon/material/knife,\
prob(10);/obj/item/weapon/material/hatchet/tacknife/combatknife,\
prob(10);/obj/item/weapon/material/butterfly/switchblade,\
prob(10);/obj/item/weapon/gun/projectile/luger,\
prob(10);/obj/item/weapon/gun/projectile/luger/brown,\
/* prob(10);/obj/item/weapon/gun/projectile/pipegun,\ */
prob(10);/obj/item/weapon/gun/projectile/revolver,\
prob(10);/obj/item/weapon/gun/projectile/revolver/detective,\
prob(10);/obj/item/weapon/gun/projectile/revolver/mateba,\
prob(10);/obj/item/weapon/gun/projectile/revolver/judge,\
prob(10);/obj/item/weapon/gun/projectile/colt,\
prob(10);/obj/item/weapon/gun/projectile/shotgun/pump,\
prob(10);/obj/item/weapon/gun/projectile/shotgun/pump/rifle,\
prob(10);/obj/item/weapon/gun/projectile/shotgun/pump/rifle/mosin,\
prob(10);/obj/item/weapon/melee/baton,\
prob(10);/obj/item/weapon/melee/telebaton,\
prob(10);/obj/item/weapon/melee/classic_baton,\
prob(10);/obj/item/weapon/melee/energy/sword,\
prob(9);/obj/item/weapon/gun/projectile/automatic/wt550/lethal,\
prob(9);/obj/item/weapon/gun/projectile/automatic/pdw,\
prob(9);/obj/item/weapon/gun/projectile/derringer,\
prob(9);/obj/item/weapon/gun/energy/crossbow/largecrossbow,\
prob(9);/obj/item/weapon/gun/projectile/automatic/mini_uzi,\
prob(9);/obj/item/weapon/gun/projectile/pistol,\
prob(9);/obj/item/weapon/gun/projectile/shotgun/pump/combat,\
prob(9);/obj/item/weapon/twohanded/fireaxe,\
prob(9);/obj/item/weapon/cane/concealed,\
prob(9);/obj/item/weapon/gun/energy/gun,\
prob(8);/obj/item/weapon/gun/energy/ionrifle,\
prob(8);/obj/item/weapon/gun/energy/retro,\
prob(8);/obj/item/weapon/gun/energy/gun/eluger,\
prob(8);/obj/item/weapon/gun/energy/xray,\
prob(8);/obj/item/weapon/gun/projectile/automatic/c20r,\
prob(8);/obj/item/weapon/gun/projectile/automatic/stg,\
prob(8);/obj/item/weapon/melee/energy/sword,\
/* prob(8);/obj/item/weapon/gun/projectile/automatic/m41a,\ */
prob(7);/obj/item/weapon/gun/energy/captain,\
prob(7);/obj/item/weapon/gun/energy/sniperrifle,\
prob(7);/obj/item/weapon/gun/projectile/automatic/p90,\
prob(7);/obj/item/weapon/gun/projectile/automatic/as24,\
prob(7);/obj/item/weapon/gun/projectile/automatic/sts35,\
prob(7);/obj/item/weapon/gun/projectile/automatic/z8,\
prob(7);/obj/item/weapon/gun/energy/gun/burst,\
prob(7);/obj/item/weapon/gun/projectile/shotgun/pump/unsc,\
prob(7);/obj/item/weapon/gun/projectile/deagle,\
prob(7);/obj/item/weapon/gun/launcher/grenade,\
prob(6);/obj/item/weapon/gun/projectile/SVD,\
prob(6);/obj/item/weapon/gun/projectile/automatic/l6_saw,\
prob(6);/obj/item/weapon/gun/energy/lasercannon,\
prob(5);/obj/item/weapon/gun/projectile/automatic/carbine,\
prob(5);/obj/item/weapon/gun/energy/pulse_rifle,\
prob(4);/obj/item/weapon/gun/projectile/automatic/battlerifle,\
prob(3);/obj/item/weapon/gun/projectile/deagle/camo,\
prob(3);/obj/item/weapon/gun/energy/gun/nuclear,\
prob(2);/obj/item/weapon/gun/projectile/deagle/gold,\
prob(1);/obj/item/weapon/gun/launcher/rocket,\
prob(1);/obj/item/weapon/gun/projectile/gyropistol,\
prob(1);/obj/item/weapon/gun/projectile/heavysniper,\
prob(1);/obj/item/weapon/plastique,\
prob(1);/obj/item/weapon/material/sword,\
prob(1);/obj/item/weapon/material/sword/katana)

/obj/random/weapon/guarenteed
spawn_nothing_percentage = 0

/obj/random/ammo_all
name = "Random Ammunition (All)"
desc = "This is random ammunition. Spawns all ammo types."
icon = 'icons/obj/ammo.dmi'
icon_state = "666"
item_to_spawn()
return pick(/*prob(5);/obj/item/weapon/storage/fancy/shotgun_ammo/beanbag,\
prob(5);/obj/item/weapon/storage/fancy/shotgun_ammo/pellet,\
prob(5);/obj/item/weapon/storage/fancy/shotgun_ammo/flash,\
prob(5);/obj/item/weapon/storage/fancy/shotgun_ammo/slug,\*/
prob(5);/obj/item/ammo_magazine/a357,\
prob(5);/obj/item/ammo_magazine/clip/a762,\
prob(5);/obj/item/ammo_magazine/c45m,\
prob(5);/obj/item/ammo_magazine/c45m/rubber,\
prob(5);/obj/item/ammo_magazine/c38,\
prob(5);/obj/item/ammo_magazine/c38/rubber,\
prob(5);/obj/item/weapon/storage/box/flashbangs,\
prob(5);/obj/item/ammo_magazine/s762,\
prob(4);/obj/item/ammo_magazine/clip/a556,\
prob(4);/obj/item/ammo_magazine/clip/c45,\
prob(4);/obj/item/ammo_magazine/clip/c9mm,\
prob(4);/obj/item/ammo_magazine/c45uzi,\
prob(4);/obj/item/ammo_magazine/c762,\
prob(4);/obj/item/ammo_magazine/mc9mm,\
prob(4);/obj/item/ammo_magazine/mc9mml,\
prob(4);/obj/item/ammo_magazine/mc9mmt,\
prob(4);/obj/item/ammo_magazine/mc9mmt/rubber,\
prob(4);/obj/item/ammo_magazine/a10mm,\
prob(4);/obj/item/ammo_magazine/p90,\
/* prob(4);/obj/item/ammo_magazine/m14,\
prob(4);/obj/item/ammo_magazine/m14/large,\ */
prob(4);/obj/item/ammo_magazine/c762,\
prob(4);/obj/item/ammo_magazine/a556,\
prob(4);/obj/item/ammo_magazine/a556m,\
prob(3);/obj/item/ammo_magazine/clip/a10mm,\
prob(3);/obj/item/ammo_magazine/clip/a50,\
prob(3);/obj/item/ammo_magazine/s762,\
prob(2);/obj/item/ammo_magazine/a50,\
prob(2);/obj/item/ammo_magazine/a762,\
prob(1);/obj/item/ammo_magazine/battlerifle,\
prob(1);/obj/item/ammo_casing/rocket,\
prob(1);/obj/item/weapon/storage/box/sniperammo,\
prob(1);/obj/item/ammo_magazine/stg,\
prob(1);/obj/item/ammo_magazine/tommydrum,\
prob(1);/obj/item/ammo_magazine/tommymag
)
38 changes: 38 additions & 0 deletions code/game/objects/structures/crates_lockers/largecrate_vr.dm
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/obj/structure/largecrate/birds //This is an awful hack, but it's the only way to get multiple mobs spawned in one crate.
name = "Bird crate"
desc = "You hear chirping and cawing inside the crate. It sounds like there are a lot of birds in there..."

/obj/structure/largecrate/birds/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W, /obj/item/weapon/crowbar))
new /obj/item/stack/material/wood(src)
new /mob/living/simple_animal/cat/bird(src)
new /mob/living/simple_animal/cat/bird/fluff/kea(src)
new /mob/living/simple_animal/cat/bird/fluff/eclectus(src)
new /mob/living/simple_animal/cat/bird/fluff/greybird(src)
new /mob/living/simple_animal/cat/bird/fluff/eclectusf(src)
new /mob/living/simple_animal/cat/bird/fluff/blue_caique(src)
new /mob/living/simple_animal/cat/bird/fluff/white_caique(src)
new /mob/living/simple_animal/cat/bird/fluff/green_budgerigar(src)
new /mob/living/simple_animal/cat/bird/fluff/blue_Budgerigar(src)
new /mob/living/simple_animal/cat/bird/fluff/bluegreen_Budgerigar(src)
new /mob/living/simple_animal/cat/bird/fluff/commonblackbird(src)
new /mob/living/simple_animal/cat/bird/fluff/azuretit(src)
new /mob/living/simple_animal/cat/bird/fluff/europeanrobin(src)
new /mob/living/simple_animal/cat/bird/fluff/goldcrest(src)
new /mob/living/simple_animal/cat/bird/fluff/ringneckdove(src)
new /mob/living/simple_animal/cat/bird/fluff/cockatiel(src)
new /mob/living/simple_animal/cat/bird/fluff/white_cockatiel(src)
new /mob/living/simple_animal/cat/bird/fluff/yellowish_cockatiel(src)
new /mob/living/simple_animal/cat/bird/fluff/grey_cockatiel(src)
new /mob/living/simple_animal/cat/bird/fluff/too(src)
new /mob/living/simple_animal/cat/bird/fluff/hooded_too(src)
new /mob/living/simple_animal/cat/bird/fluff/pink_too(src)
var/turf/T = get_turf(src)
for(var/atom/movable/AM in contents)
if(AM.simulated) AM.forceMove(T)
user.visible_message("<span class='notice'>[user] pries \the [src] open.</span>", \
"<span class='notice'>You pry open \the [src].</span>", \
"<span class='notice'>You hear splitting wood.</span>")
qdel(src)
else
return attack_hand(user)
12 changes: 12 additions & 0 deletions code/modules/clothing/suits/armor_vr.dm
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/obj/item/clothing/suit/armor/heavy
name = "heavy armor"
desc = "An old military-grade suit of armor. Incredibly robust against brute force damage! However, it offers little protection from energy-based weapons, which, combined with its bulk, makes it woefully obsolete."
icon_state = "heavy"
item_state_slots = list(slot_r_hand_str = "swat", slot_l_hand_str = "swat")
armor = list(melee = 90, bullet = 80, laser = 10, energy = 10, bomb = 80, bio = 0, rad = 0)
w_class = 5 // massively bulky item
gas_transfer_coefficient = 0.90
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
slowdown = 5 // If you're a tank you're gonna move like a tank.
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
siemens_coefficient = 0

0 comments on commit 9da17a2

Please sign in to comment.