Commit Graph

2511 Commits

Author SHA1 Message Date
killer653 fe767f44b5 Literally right after I submitted the PR 2017-05-11 15:36:09 -04:00
killer653 a535948e90 Serdy desc changes, serdy gun whitelist. 2017-05-11 15:30:52 -04:00
Arokha Sieyes 0a33bd5234 More tweaks to new head guns 2017-05-09 11:08:48 -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
Yoshax 40be042005 Add's Tempest's custom implant item (#1461)
* Implant stuff

Does more implant stuff

Does even more implant stuff

EVEN MOAR IMPLANT STUFF

Adds Tempest's custom fluff implant along with the generalized parent type

* Changes implant to just use its own reagents holder rather than a beaker, thanks Leshana

* Last commit maybe? Yay?
2017-05-03 22:09:07 -04:00
Arokha Sieyes a3bf1b2492 Merge pull request #1457 from Yoshax/permitguns
Adds Aerowing and Table's custom item/gun stuff
2017-05-03 22:08:26 -04:00
JoanRisu 88e5fe0ead Resolves #1188 and #794 (#1427)
* resolves  #1188 and #794

* Moves custom taur armor stuff to the fluff items file. Adds comments to items for organizational purposes.

* Fixes

* Additional fixins

* Thanks Travis
2017-05-03 22:07:38 -04:00
Yoshax c939cf1842 Adds Aerowing and Table's custom item/gun stuff 2017-05-01 14:26:14 +01:00
Arokha Sieyes ae96b83098 Merge pull request #1436 from LiquidFirefly/master
Gazer Fluff.
2017-04-29 19:55:28 -04:00
Cameron653 0444c6093e Fixes Unathi TF organ rejection (#1439)
* Fixes people dying from Unathi TF

* Targeting only unathi doesn't work

Reverting back to original fix.

* A bit of rearrangement.

The for statement below it isn't needed for the internal organs, but
it's nice to have it happen after the internal organs are recreated.

* Fixes internal organ rejection
2017-04-29 19:21:26 -04:00
Layla Crosse/Occula Drenn a77def9829 Add's LiquidFirefly's Gazer fluff item stuff
Add files via upload

Add files via upload

Add files via upload

Added Gazertail to repository, fixed error.

Reverting bad changes.

Apologies for not reading.

Adding Monoeye.

Fixing bad changes, Readding monoeye.
2017-04-29 02:50:26 +01:00
SeigaSeiga 0f77583881 Adds the cyborg visor as a fluff item, a child of regular sunglasses. Adds Seiga:Alfonso to custom_items.txt. 2017-04-28 23:06:20 +01:00
Arokha Sieyes b7898c1eaf Merge pull request #1393 from Cameron653/master
Transformation Changes
2017-04-23 23:54:15 -04:00
Arokha Sieyes 4f6ea943da Merge pull request #1419 from OrbisAnima/orb-cargo-love
Added 3 new crates to cargo:
2017-04-23 23:53:59 -04:00
OrbisAnima 3efabaf2ab Added 3 new crates to cargo:
Recreation: - Recreational Restraints, all the kind of stuff you might need to restrain someone but still showing you care, whip included.
Science: - Dangerous Predator Crate, contains a random common predator for science analisys, a system that might come in the future!
(Contraband) Extremely Dangerous Predator Crate, Contains a random yet quite mortal predator, for analiisys only by the bravest or fooliest people in the crew.
2017-04-20 20:48:27 -03:00
Leshana f8e34eabbb Un-scale HUDs for micros and macros.
* Set appearance_flags on HUD images to prevent them from being scaled up/down when the owning mob is macro/micro.
* Optimized the resize() proc and made it adjust the vertical position of the unscaled hud to stay even with the top of the mob's head.
* Also fix the resize proc to be consistent with update_icons().   Now micros wont be in the middle of a turf temporarily after resizing.
2017-04-19 23:59:16 -04:00
killer653 7379e0143e More TF fixes and cleanup 2017-04-19 17:05:42 -04:00
killer653 006cc6de65 Adds more transformation types for specific
Changes "Species Transformation" to "Replica Transformation" for
clarity, as people were using it and expecting them to change species,
not be a perfect 1:1 replica of the person doing the TF.

Adds "Change_species_and_taur" mode, which does exactly as it says
without making the person appear as a 1:1 replica as the pred TFing them
Adds "Change_hair_and_eyes" tf mode, which allows the changing of the
prey's hair and eye color without having to completely TF them or change
their gender.

Fixes a bug that infinitely drained the pred's nutrition when they used
a TF mode. Slightly increases amount of nutrition the prey gets from the
pred.
2017-04-15 19:48:17 -04:00
Screemonster e17449dd28 adds horse, cow, fantail and wagtail tails, and colorable antennae "ears" 2017-04-14 19:02:34 +01:00
Arokha Sieyes e236c33576 Merge pull request #1372 from VOREStation/aro-synthtails
Fix up a few synth issues
2017-04-10 20:29:21 -04:00
Arokha Sieyes 6d74e20e2a Fix up a few more things with synth printing
Species now 'suggested' by robolimb manufacturer, helps with getting the correct hairstyle choices for each synth, so Taj have access to Taj hair styles and whatnot in mirrors if they are using a Taj-based synth. Also adds a DSI Akula variant that Zalvine should touch up later hopefully.
2017-04-09 23:56:13 -04:00
Arokha Sieyes 909231963e Add generic tails for DSI synths
So when made they come with the generic species tail, at least.
2017-04-09 22:13:34 -04:00
Leshana eef8480444 Adds the Body Designer for resleeving
* Adds Body Designer computer, which allows you to customize body designs similarly to character setup, but in game.
* Designs are savable to disks which can be loaded into the the resleeving controller console to print and resleeve into.
* Fixes line breaks on OOC notes in the resleeving computer.
* Added circuits so the body designer is constructable, and designs so the circuit is researchable.
* Added a proc for reverse lookup of size_multiplier -> scale name (0.25 -> Micro etc)
2017-04-09 16:23:35 -04:00
Arokha Sieyes 8d30949ddf Merge pull request #1345 from VOREStation/aro-sync
Updates permits
2017-04-05 01:00:15 -04:00
Arokha Sieyes 8c7fad0fa9 Updates custom items to reflect permit status 2017-04-05 00:28:09 -04:00
Arokha Sieyes 58cbfefd78 Updates permits
Two permit updates
2017-04-04 22:19:15 -04:00
Leshana 39cf9a9a9b Use species for determining which organs to persist.
Also added some safety checks, and better handled digitized brains.
2017-04-04 20:52:26 -04:00
Leshana f17ea64bbe Enables round-to-round persistence of a few aspects of characters.
* More accurately, it automates updating your character setup.  None of this code does anything you could not already do manually on the Character Setup screen, it simply does it automatically for you.
* Specifically a few things are saved either at round end or when you cryo:
  * Your late-join spawn location is determined by which cryo/elevator/etc you used to leave last time.  Departing thru the elevators will set your spawn location to elevators etc.
  * Your weight is saved (also any extra or deficient nutrition is resolved into weight gain/loss)
  * Your limbs settings are updated based on your status at end of round (whether limbs are normal, missing, robotic, etc)
  * Your markings are saved so they will be the same as when they were at end of round.
* ALL of these changes are optional, toggled on the VORE tab of character setup.
* Replaced hard coded numbers for weight gain with constant defines.
2017-04-04 07:33:09 -04:00
Arokha Sieyes 32455d3abf Slight oversight on transloc failure chance
Needs to have at least 2 beacons, since otherwise this will pick from an empty list.
2017-04-03 02:47:45 -04:00
Arokha Sieyes 9099b93ae8 Replace CD's hand tele with Translocator
Because nobody wants to be randomly spaced for using a tool given to you. Also rebalances translocataor slightly. 5% failure chance, but only to send you to another beacon, not to space you, unless of course you throw one of the beacons into space, so don't do that. Also requires recharges now and has a weapon device cell. Three uses per charge.
2017-04-03 02:40:15 -04:00
Arokha Sieyes a06a1af3c2 Change my flash pistol to Hunter 2017-04-02 19:26:39 -04:00
Yoshax 7e27405e6c Adds whitelist + custom item stuff 2017-03-31 23:25:59 +01:00
Arokha Sieyes 339806fcc2 Merge pull request #1288 from VOREStation/aro-licklimit
Add cooldowns to licking and dogborgs
2017-03-30 14:51:00 -04:00
Arokha Sieyes a8ebc54170 One-click mouse scooping and edibility
Makes mice scoopable with one click, and can be ate rather than needing to be grabbed.

Resolves #1255
2017-03-30 14:07:30 -04:00
Arokha Sieyes ea52a15c90 Add cooldowns to licking and dogborgs
They didn't have one, now it's the default attack click cooldown time.

Resolves #1266
2017-03-30 12:52:53 -04:00
Arokha Sieyes a28c9eacb2 Drop some custom items 2017-03-29 23:40:02 -04:00
Arokha Sieyes e38701ddb1 leg holster 2017-03-29 23:37:19 -04:00
OrbisAnima 43462dd1c4 Add Slug Tail sprite by @Natje0
Solves #1243
2017-03-29 09:32:21 -03:00
killer653 a58957db4d BatterBatter!
Duplication of #1259
Since another PR prevented #1259 from being merged, I went ahead and
just copied and pasted it for Dhael
2017-03-28 19:38:55 -04:00
Arokha Sieyes 8df21e989c Merge pull request #1264 from VOREStation/aro-syncshuttles
Polaris Sync
2017-03-28 13:19:32 -04:00
Arokha Sieyes 1ba87bea73 Merge polaris sync 2017-03-28 12:24:46 -04:00
JoanRisu 284460593c Resolves #1129. Adds custom_onmob_vr.dmi for onmob sprites for glasses, masks, and shoes. 2017-03-27 01:54:55 -07:00
JoanRisu 729168790a Merge branch 'master' of https://github.com/VOREStation/VOREStation into Fluff_Items_worshop 2017-03-26 22:43:18 -07:00
JoanRisu 8d6377f4b4 adds vehicles to the cargo lists and makes changes to a few things. 2017-03-26 22:39:54 -07:00
Arokha Sieyes 32017be265 Fix unsupported tail spam
For vwag stuff.
2017-03-26 19:55:47 -04:00
Arokha Sieyes 4302d2373b Adds 4 waggable tails, *vwag emote, other fixes
Using the *vwag emote you can toggle the vorestation specific tails to wag. Tails marked with (vwag) in the tail selection support this.
New tails are: a new vulp tail (does not replace current one, selectable as a custom tail), a tiger tail, a short tail, and a curl tail (husky or doge). All four support vwag.

Also fixed the mouse tail. It said "mouse, grey" when what it meant was "pink" and then it also said "colorable" mouse tail but that was a lie because it was not colorable at all. Not really. Not in any reasonable way.

Also added fully colorable mouse ears without the pink inner part as an option.
2017-03-26 02:10:17 -04:00
Leshana 519252b787 Merge pull request #1234 from VOREStation/polaris-sync-and-simple-animal
Polaris sync and simple animals
2017-03-24 01:03:20 -04:00
Leshana f0270451a7 Added vore capabilies to the new simple_animal system.
* Added happy friend time mechanics working properly for fox and cat.
* Added vore mechanics and vore overrides
* No longer enable vore on simple animals by creating a "/vore" subtype.  Instead we simply enable vore on the main type.  Consensus being we don't need a type for non-vore versions of stuff.
  * This allowed us to revert many path references throughout the codebase to the original non-vorestation back to their original values.  In these cases the "Vorestation Edit" comment is removed.
* Moved the vore overrides for upstream simple animals into its own file zz_vore_overrides.dm
2017-03-22 19:32:19 -04:00
Arokha Sieyes 452ee7e80f Prevent ranged vore
:[
2017-03-21 21:01:18 -04:00
Arokha Sieyes 60791e3645 VOREStation Portion of AI Upgrade 2017-03-21 03:02:31 -04:00