Commit Graph

1493 Commits

Author SHA1 Message Date
Kelshark
641246155c Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	config/custom_items.txt
#	icons/mob/vore/taurs_vr.dmi
2017-06-01 17:25:39 -04:00
Arokha Sieyes
6ada64082b Adds Trash Piles
Replaces some lockers and racks in maintenance with trash piles. They are presistent loot piles for people who just can't help but greytide. It allows people who join later in the shift to still get goodies. Each is searchable once per shift by each ckey.

They have three loot lists: alpha, beta, and gamma.

Alpha has the highest chance and just random maint stuff. All usable items (no random empty beer cans) but nothing you couldn't find elsewhere.
Beta has a lower chance of spawning and is usually contraband, mechaically useful stuff. Radio jammers and the like.
Gamma is dangerous or highly illegal contraband, and is unique. Guns (nonlethal!), teleporters, syndicate IDs, etc.

Gamma items have special handling: all of the trash piles share a gamma list, and when an item is given out from the gamma list to someone, it's de-pooled so that another trash pile won't hand it out. The pile-collective maintains a reference to it as an 'allocated' gamma item though. Then, when the gamma list runs out, it reviews allocated gamma items to find any that it might be able to 're'-distribute. Namely ones that have been deleted, or are in cryopod computers because the user left with them. It can then hand that item out again. If it cannot hand out a new gamma item, it gives beta instead.

You can also just manually put gamma-list items back into the piles if you're leaving. Or, if you find a translocator, but already made yourself one in R&D (or later make one), or you're the RD and find a bluespace harpoon, you can stuff the translocator/whatever back into any trash pile and it'll be re-pooled into all of them. You can only return gamma items this way, not beta/alpha.

Additionally, if you find yourself playing a simple animal mob for an event (or you're a mouse), you can hide in trash piles by clicking them. There's a 50% chance you're revealed if the pile is searched. You can climb out by clicking the pile again. I dunno if that'll ever get used but it was easy to code, so eh.
2017-05-31 18:36:00 -04:00
Spades
3a0bdf5cf9 Name tweak for Anewbe 2017-05-27 16:31:17 -04:00
Spades
cef9c4f98d One last thing. 2017-05-27 16:27:05 -04:00
Spades
ae3d877730 Might be helpful if I clicked save on my files 2017-05-27 16:25:38 -04:00
Spades
36544bc7da Documentation, proper file naming, and more consistency 2017-05-27 16:23:39 -04:00
Spades
bb2f19fe7d Map fixes, and a comment removal 2017-05-27 05:14:51 -04:00
Spades
bc3f4fb0dc Polishing oversights away 2017-05-27 05:07:34 -04:00
Spades
3ff9d441f9 Finishes fixing ammo inconsistencies 2017-05-27 04:39:49 -04:00
Spades
8579adcc53 Naming convention of ammo is now consistent
s = Speedloaders. (Functionally the same as clips, but they're not
_really_ the same thing, just in case we change these later.)
c = Clips. (Can also be used to fill other magazines.)
m = Magazine. (Holds ammo rounds.)
a = Ammo. (Individual rounds of ammo.)
2017-05-26 19:32:23 -04:00
Leshana
8c8e04a0a0 Converted VOREStation custom guns and ammo to handle the swap of 5.56 and 7.62 ammo.
* Swapped our loot drops and guns to keep the damage of loot and guns the same.
* Edited the c762 magazine definition back to keep the same ammo count in each magazine type as before.

Conversion chart used:
==OLD==     max_ammo    ==NEW=      max_ammo
a556        10          s762        10
a556m       20          c762        (20)

s762        10          c556        20
c762        20          c556/ext    30
a762        50          a556        50
2017-05-26 17:54:04 -04:00
Leshana
5f5ea3ea3b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-merge-2017-05-26
# Conflicts:
#	code/game/gamemodes/technomancer/spells/insert/mend_burns.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_metal.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_organs.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_wires.dm
#	code/game/machinery/computer/Operating.dm
#	code/game/machinery/computer/camera.dm
#	code/game/machinery/computer/communications.dm
#	code/game/machinery/computer/security.dm
#	code/game/machinery/computer/skills.dm
#	code/game/objects/items/devices/radio/jammer.dm
#	html/changelogs/.all_changelog.yml
#	maps/~map_system/maps.dm
#	nano/images/nanomap_z1.png
#	nano/images/nanomap_z5.png
2017-05-26 15:29:46 -04:00
Kelshark
15b8fcbe6d Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/game/machinery/computer/communications.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	config/custom_items.txt
#	icons/misc/title_vr.dmi
#	icons/mob/human_races/r_def_xenochimera.dmi
#	maps/RandomZLevels/fileList.txt
#	vorestation.dme
2017-05-24 13:46:58 -04:00
Spades
4abde8007a Description fix. 2017-05-21 20:48:12 -04:00
Spades
79b75b1857 Buffs Bolt Action rifle damage slightly
My reasoning behind this request is because, aside from a small armor
pen value, a puny little .45 pistol is better in every other way to a
bolt _rifle_, and that just doesn't make any sense, and isn't very fun.
It basically just exists as a lousy gimmick right now.

This PR makes it slightly less of a gimmick and more of a weapon people
might actually use if they don't have many options. This weapon is
especially popular during cult rounds when Cargo needs some kind of
guns.

ToDo: Fix the Lever rifle to not have speedloader ability. Also, why
does the Lever rifle already use 7.62 ammo? Did anyone know this?
2017-05-21 20:46:12 -04:00
MagmaRam
2a42f9ef55 Merge pull request #3405 from Anewbe/bullet_swap
Makes the 556 and 762 calibers more appropriate to their naming
2017-05-21 13:17:58 -05:00
Kelshark
12830ea506 Merge branch 'master' of https://github.com/Repede/YawnWiderStation 2017-05-17 10:49:53 -04:00
Repede
2e7329b183 Merge pull request #50 from Repede/Izac
Mooooore fluff for General and me and Deathy's fluff getting a small fix
2017-05-17 10:49:30 -04:00
izac112
4b60cb5914 Mooooore fluff for General and me and Deathy's fluff getting a small fix 2017-05-17 02:25:45 +02:00
Leshana
5ae26332fa Merge branch 'master' into aro-tether-wip
# Conflicts:
#	code/ZAS/_docs.dm
#	code/game/area/areas.dm
#	code/game/objects/explosion.dm
#	code/modules/holodeck/HolodeckControl.dm
#	code/modules/mob/living/say.dm
2017-05-16 00:26:32 -04:00
Anewbe
903a2a2e5f Fixes a few things, adds 556 clips 2017-05-12 18:03:49 -05:00
Kelshark
3d466d9213 Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	config/custom_items.txt
#	icons/mob/vore/taurs_vr.dmi
2017-05-12 13:06:10 -04:00
Arokha Sieyes
7058806865 Ports 'head' guns from Eris, change Hunter sprite
RD: Bluespace Harpoon
HoS: Lamia handgun
HoP: Holdout E-Gun
A few other unused ones included in code.
2017-05-09 02:42:32 -04:00
Leshana
88f0e65cf9 Converts our own uses of PoolOrNew to use just new() 2017-05-08 21:24:47 -04:00
Leshana
4fbfa7ee37 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-05-08
# Conflicts:
#	code/modules/mob/dead/observer/observer.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/mob_defines.dm
#	html/changelogs/.all_changelog.yml
#	vorestation.dme
2017-05-08 21:07:45 -04:00
Anewbe
42fe5d9ed6 Merge pull request #3412 from VOREStation/pool-closed
Removes the datum pool, as it is not performant.
2017-05-08 17:21:24 -05:00
Leshana
44ff1a70c6 Removes the datum pool, as it is not performant.
* Creating new objects is cheap, in fact comparable to the cost of getting it out of the pool, so it doesn't help there.
* Placing items in the pool is far more expensive than letting them garbage collect due to the resetting of vars and such.
2017-05-04 01:58:33 -04:00
Datraen
3d442044d1 Adds Gene Targetting mode to Floral Somatoray
While I was rooting around in hydroponics code, I saw that a list was being regenerated with UI interaction, so I threw the list into the plant controller.

No proper sprites for the Floral Somatoray's new mode yet, but it uses the gun sprite from mutate mode, and the projectile sprite from yield mode.
2017-05-03 13:33:58 +01:00
Anewbe
0aa55af823 Typo fix 2017-05-01 22:43:59 -05:00
Anewbe
58b9c63ec2 Makes the 556 and 762 calibers more appropriate to their naming 2017-05-01 20:25:43 -05:00
Anewbe
3205631de3 Fixes an issue with the practice laser carbine 2017-04-30 10:26:05 -05:00
Anewbe
aaee637d30 Merge pull request #3377 from LorenLuke/PointBlankAim
Aim mode point blank targets on harm.
2017-04-29 10:42:22 -05:00
Kelshark
71c0531829 Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/modules/multiz/basic.dm
#	config/custom_items.txt
2017-04-29 10:13:45 -04:00
Neerti
ec366d5d74 Makes Technomancer use modifiers, fixes a few bugs 2017-04-28 16:27:51 -04:00
LorenLuke
fb4a24fd38 Aim mode point blank targets on harm. 2017-04-26 11:26:31 -07:00
Anewbe
18c0b34704 Should fix the wounded accuracy gun bug 2017-04-26 11:34:00 -05:00
Arokha Sieyes
055c998f82 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
# Conflicts:
#	code/modules/integrated_electronics/subtypes/reagents.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/organs/organ_external.dm
#	code/modules/ventcrawl/ventcrawl.dm
#	html/changelogs/.all_changelog.yml
2017-04-25 15:04:54 -04:00
Anewbe
a4d9db202b Allows ion pistol on the belt. 2017-04-21 19:24:06 -05:00
Anewbe
e17eccae93 Adds ion pistol to uplink, allows holstering 2017-04-20 20:04:21 -05:00
Anewbe
d7b347c4c9 Merge pull request #3333 from Neerti/4/18/2017_modifier_system_and_lings
Adds Modifier System, Changes Some Ling Stuff
2017-04-19 13:29:21 -05:00
Neerti
4378fc0812 Merge pull request #3295 from Anewbe/lever_action
Adds a lever-action rifle
2017-04-19 13:58:37 -04:00
Neerti
e951ff344e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 4/18/2017_modifier_system_and_lings 2017-04-19 13:47:57 -04:00
Anewbe
2306d3726e Merge pull request #3325 from LorenLuke/Silenced-Notification
Silenced Weapons tell firer when fired
2017-04-19 10:30:30 -05:00
Neerti
ea6128f986 Adds Modifier System, Changes Some Ling Stuff
Adds a fairly simple system that allows adjusting various numbers like max health, incoming damage, outgoing melee damage, etc.  The nice part is that changing certain variables this way (like max health) is a lot safer than manually setting the max health var directly.
Changes a lot of short lines of code to point towards a variable's getter or setter helper instead of reading the var directly so the modifiers can work.
Endoarmor, delayed toxin sting, Enfeebling sting, and recursive adrenaline overdose now use the modifier system.
Enfeebling sting now only lasts two minutes, from five minutes, however it now also reduces the victim's melee damage by 25%/50%, and increases the damage they suffer by 10%/35%, for normal and recursive respectively.
Delayed Toxin Sting's effects are now felt all at once instead of over the course of a few minutes.
2017-04-18 21:23:59 -04:00
Kelshark
e1eae846f9 Merge branch 'master' of https://github.com/VOREStation/VOREStation 2017-04-18 19:29:23 -04:00
Kelshark
fb47e064d5 Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	maps/RandomZLevels/labyrinth.dmm
2017-04-18 19:25:46 -04:00
LorenLuke
1f0264f68b Adds range/small message to notification. 2017-04-17 19:41:17 -07:00
LorenLuke
c28d8738aa Silenced Weapons tell firer when fired. 2017-04-17 10:34:40 -07:00
Leshana
7a4dc4bf79 Merge remote-tracking branch 'polaris/master' into polaris-sync
# Conflicts:
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/zresearchlabs.dmm
2017-04-15 23:14:32 -05:00
Neerti
d9bd49aae4 Aiming at someone is now logged 2017-04-14 03:40:03 -04:00