Commit Graph

457 Commits

Author SHA1 Message Date
Neerti
139d397a47 Merge pull request #3578 from Anewbe/surgical_caps
Adds surgical caps to the loadout
2017-07-23 17:42:51 -04:00
Anewbe
d7875f5377 Merge pull request #3609 from Belsima/legwarmers
Adds a load of zippos to the loadout.
2017-07-18 16:27:09 -05:00
Verkister
b936f72d9a Merge branch 'master' of https://github.com/VOREStation/VOREStation into blehh
# Conflicts:
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	icons/mob/vore/tails_vr.dmi
2017-07-18 11:05:33 +03:00
Anewbe
b22a9fa575 Merge pull request #3589 from Belsima/gloves
Adds fingerless gloves.
2017-07-17 15:42:28 -05:00
Belsima
a291ae9889 Adds a load of zippos to the loadout. 2017-07-17 14:57:14 -04:00
Cameron653
b7608f81e8 Fixes code up. 2017-07-13 17:12:46 -04:00
killer653
c736b6f824 Everything works except for the loadout spawn
Work on later.
2017-07-13 10:15:26 -04:00
Verkister
84b994b2d7 Slight charstomization overhauls.
-Lined up and un-overlapped the setup previews. Also taurs can now fit into the frame and not be cropped in half.
-Unlocked the hidden and forgotten feature for secondary tail/taur colors.
-Currently the only enabled things are the colorable wolf tail and a new dual color wolftaur. The framework for more is ready for use though!
-Liberated ear coloring from the oppression of hair color.
-Disabled drake and otie taurs since they lack all gear compatibility :v
2017-07-13 00:20:02 +03:00
Anewbe
4e93ac107f Merge pull request #3584 from Belsima/pens
Adds a fountain pen.
2017-07-11 11:24:27 -05:00
Belsima
e51de25dea Adds fingerless gloves. 2017-07-11 00:49:02 -04:00
Belsima
1d7cea9864 renames a mislabelled pen 2017-07-10 18:07:07 -04:00
Belsima
b7a34a3645 Adds a gilded pen. 2017-07-10 18:01:43 -04:00
Belsima
c0d22058b4 Adds a boatload of sweaters. 2017-07-10 17:49:22 -04:00
kcin2001
5b912bc601 Update loadout_xeno_vr.dm 2017-07-09 22:01:44 -07:00
kcin2001
62ea1866f9 new tesh items - loadout edition 2017-07-09 21:59:47 -07:00
Anewbe
c64f7c9fa3 Merge pull request #3505 from Dhaeleena/Somecat
Winter boots
2017-07-09 17:13:27 -05:00
Anewbe
07c82963c9 Adds surgical caps to the loadout 2017-07-09 16:18:52 -05:00
Verkister
7333ea008f Taur and borgo feature shieet!
-Added a counter for janihound to keep track of how much crap it's ate.
-Lowered janigut capacity to 25 items.
-Made mice edible for the borgo.
-Gave a gentle touch to the wolftaur sprites. (more types later?)
-Added a saddlebag version that fits itself for every quadtaur.
-Added a robust combat aesthetic saddlebag as a childtype to the forementioned.
2017-07-03 21:05:17 +03:00
Leshana
18b1828631 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-20170630 2017-06-30 22:31:43 -04:00
Yoshax
020c1d7d88 Adds material scanner and prescription ones to loadout 2017-06-30 23:56:44 +01:00
Anewbe
81e7d9ce42 Merge pull request #3513 from Belsima/snowsuit
Adds snowsuits.
2017-06-25 16:27:43 -05:00
Belsima
a62c91ebd3 Appeases the mergelords. 2017-06-16 20:27:08 -04:00
Arokha Sieyes
b1aeba9281 Persistent size between rounds
Allows your size to save at the end of each round. Get shrank'd or enbiggened? Now you can stay tiny between rounds if you like that consistency.

Don't want that? Just turn it off on the VORE tab. Accidentally left it on, and got saved? Just change your size to what you want in the character setup (and turn off saving it, too).
2017-06-16 09:41: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
5236e2675f NIF Fixes and Soulcatcher NIFSoft, Money Tweak 2017-06-09 01:08:34 -04:00
Belsima
11ceb9e92f Adds snowsuits.
Also fixes department jacket access.
2017-06-08 10:02:30 -04:00
Arokha Sieyes
08e7703e4f Finishing Up NIFs
Squashed commit:

[4b18ca1] Finishing up NIFs

[e4adb4a] Tons more NIF work

All the implants are done!
2017-06-06 19:34:41 -04:00
Dhaeleena
7f773b0099 Adds Winter boots for every department! Adds said boots to the loadout. Adds boots to all the closets and wardroves that had winter jackets. Adds boots and jackets to some closets that had neither and fitted in. 2017-06-05 16:46:54 -03:00
MatchaFrappe
68310de0ae Update loadout_uniform.dm 2017-06-05 17:06:32 +10:00
Leshana
197a648795 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-06-01
# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/ammunition/magazines.dm
2017-06-01 17:27:00 -04:00
Arokha Sieyes
a8a668b7b3 Make cancel work on trait list 2017-05-30 15:12:04 -04:00
Arokha Sieyes
a94887af27 Properly hide traits already selected 2017-05-30 14:47:39 -04:00
Arokha Sieyes
d6cb4590dd Tweak spacing on setup, fix DNA bug 2017-05-30 11:39:12 -04:00
Arokha Sieyes
684f570d0d Trait Tweaks
Adds blood color as a custom species setting
Adds photoresistant trait
Changes haste and slowdown traits to be taj and tesh speeds
2017-05-30 11:35:40 -04:00
Arokha Sieyes
d9c845a298 Don't sanitize out Custom Species unless they are changing species 2017-05-29 17:19:03 -04:00
Anewbe
1633c32c99 Merge pull request #3478 from Bromuzl/Bromuzl-High-topsLoadout
High-tops loadout
2017-05-29 13:11:57 -05:00
Arokha Sieyes
4d8b465cd9 Basically initial working traits 2017-05-29 05:08:25 -04:00
Bromuzl
48f668de95 Adds ported high-tops to loadout
Extends the high-top port to load-outs,
2017-05-27 04:38:15 -05: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
Leshana
497f2cc2d3 Fixes Runtime in 04_resleeving.dm,32: Cannot read null.ckey
proc name: copy to mob (/datum/category_item/player_setup_item/vore/resleeve/copy_to_mob)
And fixes Runtime in infocore.dm,175: code/modules/resleeving/infocore.dm:175:Assertion Failed: !deleted(M)
   proc name: init from mob (/datum/transhuman/body_record/proc/init_from_mob)
2017-05-23 01:14:56 -04:00
Schnayy
b1cb74b318 Adds 4 new clothing sprites & puts them in the loadout.
Peacoats: Requested.

Black corset/skirt combo: Requested.

Flower dress: First ss13 sprite I made, threw it in.

Red swept dress: A new, nicer red dress.
2017-05-22 18:08:01 -05: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
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
Arokha Sieyes
c541122123 Convert to using Mediamanager lobby music
Update the JSON!
2017-05-08 02:33:46 -04:00
Cerebulon
0ce6ca7290 Cleans up uniform loadout menu.
Suits are now mostly under one-piece (subtypes of 'lawyer') and modular (subtypes of 'suit_jacket') selection menus. Croptops also under selection menu.
2017-05-08 00:31:31 +01:00
Anewbe
3b82b75f83 Merge pull request #3396 from Cerebulon/skirtsuits
Adds 24 new skirt versions of suit sprites.
2017-05-05 21:55:14 -05:00
Cerebulon
36decd20b7 Adds icons. Adds skirts to loadout options and closets. 2017-04-30 02:39:27 +01:00
Cerebulon
339b269393 Adds 23 new skirt versions of existing suit sprites.
Adds them to loadout options and departmental uniform lockers as appropriate.
One new (Old Woman Attire) as equivalent to old man suit.
Some are unused, but now skirt sprites exist.
2017-04-29 12:01:40 +01:00