cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-23 03:56:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Zoo.dmm added, Vault updated, various bugfixes (#634)

Browse Source 
* :(

* Ports https://github.com/PolarisSS13/Polaris/pull/2571 early.

Need this for a map I wanna do.

* need sleep

* Emergency meds added

Resolves https://github.com/VOREStation/VOREStation/issues/600

* Fixes Fax Machine showing Sif Government

* Updates Tajaran lore to match Polaris.

* Sleeping for tonight

* Fixes #623

* Added more to the map

* Fox sprites from Paradise added

* Vore bee added

* Technical stuff no one cares about.

* Another update

* Reverts Pull #508

https://github.com/VOREStation/VOREStation/pull/508 messed up digesting
dead mobs and mice.

* Sergaling are now Saru.

* Saru

* Zoo map update, near completion

* Zoo map finished, plus Station Vault updated

* Revert "Ports https://github.com/PolarisSS13/Polaris/pull/2571 early."

This reverts commit 59e2bb211759604a95319ce6b1c74219a4b60800.

* Buzz off, Travis.

* Removed microwaves entirely so Travis stops bitching

* Travis stop being dumb

* Fix the zoo map once and for all..?

* Removes backup files.
This commit is contained in:
Spades
2016-10-09 18:55:17 -04:00
committed by GitHub
parent 2e5f80175c
commit 05869b0d9b
42 changed files with 3696 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/random/random_vr.dm
+7 -4
View File
@@ -86,10 +86,8 @@
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,\*/
return pick(prob(5);/obj/item/weapon/storage/box/shotgunammo,\
prob(5);/obj/item/weapon/storage/box/shotgunshells,\
prob(5);/obj/item/ammo_magazine/a357,\
prob(5);/obj/item/ammo_magazine/clip/a762,\
prob(5);/obj/item/ammo_magazine/c45m,\
@@ -123,6 +121,11 @@
/* 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/weapon/storage/box/flashshells,\
prob(1);/obj/item/weapon/storage/box/beanbags,\
prob(1);/obj/item/weapon/storage/box/practiceshells,\
prob(1);/obj/item/weapon/storage/box/stunshells,\
prob(1);/obj/item/weapon/storage/box/blanks,\
prob(1);/obj/item/ammo_magazine/stg,\
prob(1);/obj/item/ammo_magazine/tommydrum,\
prob(1);/obj/item/ammo_magazine/tommymag