Commit Graph

53 Commits

Author SHA1 Message Date
Hawk_v3
ba05f70db6 Merge remote-tracking branch 'upstream/master' 2020-01-13 18:37:42 +00:00
Novacat
c7b689246d Merge pull request #6423 from drexample/WE-ALWAYS-DELIVER
DO YOU NEED A SLICE OF JOY IN YOUR LIFE?
2020-01-12 22:14:17 -05:00
drexample
041db96898 WE ALWAYS DELIVER 2020-01-11 23:22:18 +03:00
drexample
1be4fe8b3c hooh 2020-01-11 06:42:54 +03:00
drexample
747114793c WE ALWAYS DELIVER! 2020-01-11 05:28:00 +03:00
Hawk_v3
838f5e9418 Merge remote-tracking branch 'upstream/master' 2020-01-06 00:47:53 +00:00
lbnesquik
e772c1a09b Add ambrosia seed as a somewhat rare loot for trash.
Why is this good:
- Low level illegal stuff to do
- I can make my pothead characters
- This is like the most common illegal drug ever, so having it being harder to get than size guns or basically anything in R&D is weird.
- What are you going to do with weed besides smoke it anyway?
2020-01-03 22:47:32 +01:00
Hawk_v3
124afe1cbc Merge remote-tracking branch 'upstream/master' 2019-07-07 18:41:28 +01:00
Heroman
706e75449d Makes trash pile components have random sprites. 2019-07-06 08:06:51 +10:00
Hawk_v3
27e73883fc Merge remote-tracking branch 'upstream/release' 2019-05-04 21:03:48 +01:00
Unknown
07b866b2f8 Last Second Tweaks
- Swaps trash pile money breifcase with something more balanced.
- Adds emergency softsuit box to luxury capsules.
2019-05-03 16:32:21 -04:00
Unknown
043b15ed58 Removes mini translocator 2019-05-03 03:15:42 -04:00
Unknown
27565f4da9 Boxed emergency suits 2019-05-03 03:06:00 -04:00
Unknown
7644861742 ...Eh, this ended up being too strong 2019-05-03 02:34:08 -04:00
Unknown
42c5f0eaa7 Tweaks Trash Pile Loot 2019-05-03 01:10:49 -04:00
Repede
e4dd365fe1 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self
# Conflicts:
#	code/_helpers/unsorted.dm
#	code/controllers/subsystems/mapping_vr.dm
#	code/datums/datum.dm
#	code/datums/datumvars.dm
#	code/datums/supplypacks/voidsuits.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/objects/items/devices/defib.dm
#	code/game/objects/items/weapons/tools/weldingtool.dm
#	code/game/world.dm
#	code/modules/client/preference_setup/loadout/loadout_accessories.dm
#	code/modules/client/preference_setup/loadout/loadout_eyes.dm
#	code/modules/client/preference_setup/loadout/loadout_head.dm
#	code/modules/client/preference_setup/loadout/loadout_suit.dm
#	code/modules/client/preference_setup/loadout/loadout_uniform.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/food/food/snacks.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/reagents/Chemistry-Recipes.dm
#	code/world.dm
#	config/custom_items.txt
#	config/example/config.txt
#	config/example/game_options.txt
#	icons/mob/robots.dmi
#	icons/obj/mining.dmi
#	maps/submaps/surface_submaps/wilderness/wilderness.dm
#	vorestation.dme
2019-04-07 19:40:12 -04:00
Unknown
976aec2f71 Sorts out this PR 2019-03-26 21:43:56 -04:00
Sebbe9123
d329ad5fe8 Re-adds mouse because someone lazy comment. 2019-02-18 10:55:57 +01:00
Hawk_v3
2bc1f83de7 Merge remote-tracking branch 'upstream/master' 2019-01-15 20:56:39 +00:00
Spades
c6c7d98a2d Merge branch 'master' into upstream-merge-5735 2019-01-14 11:20:55 -05:00
Cameron653
9dd973221d Resolves compile errors with the exception of map errors. 2019-01-12 21:09:29 -05:00
Zap-zapper
3b2258ce38 size control implant 2018-12-08 17:12:33 +07:00
Repede
944be5528b Merge pull request #101 from ProbablyCarl/master
Aphro Flower
2018-04-16 20:48:37 -04:00
Carl?
262d63f4ee Update trash_pile.dm 2018-04-15 13:32:40 -04:00
Arokha Sieyes
5967bb6dc5 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
# Conflicts:
#	code/game/objects/items/weapons/storage/boxes.dm
#	code/game/objects/items/weapons/storage/storage.dm
#	code/modules/mob/living/carbon/human/species/species.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-6.dmm
2018-02-18 00:25:36 -06:00
Leshana
ef3df27528 VOREStation Specific Merge Changes
* PolarisSS13/Polaris#4818 with VOREStation/VOREStation#3004
* Repath /obj/item/weapon/material/knuckledusters to /obj/item/clothing/gloves/knuckledusters
* Keep lights on explorer hoods
* Don't map in anti-xeno tasers from Polaris lore.
2018-02-17 16:56:31 -05:00
Leshana
38f20304ca Initialize procs for virgo 2018-02-03 01:00:57 -05:00
KotetsuRedwood
8106f27e96 Adds latex maid dresses to trash piles and loadout uniforms!
squrrrllk and other similar noises
2018-01-30 08:44:24 +00:00
Arokha Sieyes
dc0e602663 Knife path fix for VS trashpiles and a fluff item 2018-01-18 15:48:14 -05:00
Cameron Lennox
e650c62c6b LOTS OF FIXES 2017-10-08 18:05:27 -04:00
Spades
2ff8f3b0e1 Response to feedback
Dart gun is back, voice changer is gone (from this list)
2017-09-18 03:59:06 -04:00
Spades
d5b39e97c3 Trash pile tweaks
- Adds zip gun
- Removes dart gun (I don't know what this even does)
- Adds voice changer mask
- Removes vault moneybag (glitchy)
- Adds makeshift metal armor
- Removes press armor (confusing for SOP)
2017-09-18 03:18:23 -04:00
Spades
3a89fa8f4e Merge pull request #2157 from Cameron653/TRASH_PILE_ADJ
Trash pile adjustments
2017-09-13 16:08:14 -04:00
killer653
794c1c2b67 Removes 2 useless items. Fixes indents on one. 2017-09-12 18:59:43 -04:00
Cyantime
6ee2ec7c81 Fixes mouse spawners 2017-09-12 18:14:15 -04:00
Cyantime
007dc9c5d9 Reduces mice per pile from 2 to 1. 2017-08-20 21:42:00 -04:00
Cyantime
70a03f1155 No one saw that. 2017-08-16 19:20:57 -04:00
Cyantime
0df74e92fe Quik Fixes 2017-08-15 22:19:13 -04:00
Cyantime
499862bca6 Configurable mob spawners, re-implementation of trash mouse spawning. 2017-08-15 22:09:53 -04:00
Spades
60ead7642d Revert "Trash piles can now spawn mice" 2017-08-14 23:07:08 -04:00
Cyantime
8502ceaee6 Trash piles can spawn mice 2017-08-13 19:15:04 -04:00
Cyantime
c5594c31e5 alters trash pile loot pool 2017-08-06 04:18:26 -04:00
Cameron653
97e851f2e4 Adds in body snatcher device (#1822)
* Adds in body snatcher

* Modifies method the bodysnatcher works

* Fixes merge & compile error

* Update trash_pile.dm

* Update trash_pile.dm

* Gets transfer_to to work
2017-07-19 15:26:34 -04:00
Spades
619206f651 Update trash_pile.dm
oops
2017-07-08 14:30:34 -04:00
Spades
929e872ee3 Tether changes
- Reduced trash piles by probably half. There shouldn't be more than one
trash pile in any room.
- Replaced steel beds with comfy beds everywhere.
- Removed syndie ID from trash pile, because there's absolutely no way
to detect it by Security, making it OP.
- Added sizegun to trash piles. Is technically not contraband, so enjoy.
2017-07-08 11:54:49 -04:00
Spades
6a1d844f7a Radio jammer frequency nerf
The radio jammer is very obnoxious, and I feel like it should not appear as often as it does. Every shift I have been on since its addition has seen a jammer easily located.
2017-07-06 15:33:34 -04:00
Arokha Sieyes
809927c139 Merge pull request #1693 from VOREStation/aro-sleevemate
Adds the SleeveMate 3200
2017-06-11 14:39:43 -04:00
Arokha Sieyes
7c3b3c4311 Adds the SleeveMate 3200
**This commit prevents dead people from being backup-implanted!**
But it's fine because you just use this handheld thing to back them up instead and don't waste an implant, and medical starts with 4 so don't freak out. See below.

Adds the SleeveMate 3200 hand-scanner device. This device allows you to scan people to determine several things about them:
- If they have a mind in them
- If they have a client attached
- If their mind matches their body
- If they are alive/conscious

All of that is represented with in-universe messages of course. The real function of it is that it provides several features:
- One-time mind scan: Performs a one-time mind scan for those that don't like getting mind backup implants. This will store that one scan in the database, but you'll forget everything since then if resleeved. This is also useful for resleeving someone who died without an implant, but is not DNR/DNC.
- One-time body scan: Adds someone to the body scan database, or, updates their body scan if they obtained a new body. Useful if someone has used the body designer and switched bodies, as you can update their body scan. You should probably check medical records, and LOOC around before using this to resleeve someone that didn't have a body scan originally, because they may have picked that to avoid resleeving.
- Store Whole Mind: Takes the entire mind from someone, storing it into the SleeveMate 3200, rendering the patient mindless. From there, it can be backed up as many times as needed, deleted, or stored into someone with a Soulcatcher NIFSoft and run live in their VR (so now you don't have to digest/kill people for that).

Four SM3200's start in medical (1 in minimed downstairs, 3 upstairs), R&D can fab more, and they occasionally show up in trash piles for those wanting to be sneaky with a Soulcatcher, but who don't like digesting people.
2017-06-11 13:55:04 -04:00
Leshana
e644dbe18a Destroy() cleanups in VOREStation code
* Remove remaining hard del()'s in our code.
* Replace deleted() and gcDestroyed with QDELETED macro.
* Fix some strange calls directly to Del() (capital D)
* Make Destroy() return qdel hints.
* Make a few of the Destroy()'s more comprehensive in cleaning up references.
* In edited Destroy() procs, converted to use qdel_null and qdel_null_list macros when possible for pretty code.
* Removed unused variable `sleevecard`
2017-06-10 22:44:03 -04:00
Arokha Sieyes
c9915cca56 Adds the terrible quality NIF to trash piles 2017-06-06 19:35:48 -04:00