Commit Graph

13050 Commits

Author SHA1 Message Date
Arokha Sieyes
9edf3a6629 Polaris Merge Sync 2017-03-26 20:12:34 -04:00
Arokha Sieyes
52130160db Adds Body Markings
So you can customize your character with tattoos or fur colors for Taj or whatever. I'll let Anewbe work out what he wants to whitelist other than what I did already.

The icons are sliced up with the HumanScissors program I wrote, so they are per-organ. So, lop off a limb, put it on someone else, they have the tattoos and whatnot. It's part of DNA so it comes with when cloning.

They are defined in the normal sprite_accessories file and the icons are all in markings.dm in the format of "markingname-organtag" so if you have a marking that spans both arms and torso you need "thatone-torso", "thatone-l_arm", "thatone-r_arm" icon states.
2017-03-26 19:36:34 -04:00
Anewbe
431dd1d290 Adds taking drags from smokables 2017-03-26 18:07:35 -05:00
Neerti
565fea9648 Merge pull request #3144 from Anewbe/uniforms
Makes space in the uniforms.dmi file
2017-03-26 18:14:06 -04:00
Anewbe
9fedcf7d1e Merge pull request #3145 from Cerebulon/medical_handsprites
Added hand sprites to most medical items.
2017-03-26 17:06:10 -05:00
Cerebulon
6472f02040 Removed unnecessary icon_state code. Added basic scanner sprite. 2017-03-26 22:00:09 +01:00
Cerebulon
3c17d1b33f Added in-hand sprites to most item lacking them from the Medical department.
(Full list: Body bag, Advanced Mass Spectrometer, Rescue Suit Control Module, Stethoscope, Stasis bag, Defibrillator, Blood Packs, Advanced Trauma/Burn Kits, Hypospray, Biopsy Scanner, Surgical Drill, Fixovein, Retractor, Bone-Gel, Bone Setter, Cautery, Hemostat, Inflatable Wall Box.
2017-03-26 07:04:01 +01:00
Anewbe
6b0500dd27 Makes space in the uniforms.dmi file 2017-03-26 00:59:14 -05:00
Arokha Sieyes
1300ef333d Dynamic Shuttles - Code and Icon Changes 2017-03-25 21:00:08 -04:00
Anewbe
6cd424b2e1 Fixes the antag age blocker 2017-03-25 16:36:17 -05:00
Anewbe
88b0c6086e Antag Radio changes 2017-03-25 14:19:57 -05:00
Neerti
90df4dbd34 Merge pull request #3130 from Anewbe/clone_memory_disorder
Adds text for CMD to the cloning message
2017-03-25 11:26:17 -04:00
Leshana
471f724e38 Merge pull request #1235 from VOREStation/mediamanager
Media Manager - HTML5 Antilag Jukebox
2017-03-24 20:42:50 -04:00
Anewbe
3816d634ed Merge branch 'master' of https://github.com/PolarisSS13/Polaris into armor_soak
# Conflicts:
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
2017-03-24 16:35:31 -05:00
Anewbe
19231a9e5b Adds text for CMD to the cloning message 2017-03-24 15:21:47 -05:00
Anewbe
2a4948e931 Merge pull request #3128 from Cerebulon/missing_hand_sprites
Adds in-hand sprites to several items.
2017-03-24 14:51:00 -05:00
Leshana
c63c68c9a8 Implements browser streaming media jukeboxes
Ports media code from vgstation, updates it for this codebase and modernizes it.
* Changes jukeboxes to load songs using an embedded browser instead of sending over BYOND's sound channels.  This means they load out of band without lagging the server.  Also songs can be resumed mid-song, so leaving and returning to an area doesn't start the music over.
* The old WMP and VLC player modes from /vg are still supported, but adds a new default mode using HTML5 audio to play the music.
  * WMP - The oldest, still works on IE on windows, but only there, and Microsoft could break it any second.
  * VLC - Works on all platforms, but requires user to have VLC pre-installed on their computer.  Uses a scary plugin.
  * HTML5 - New default, It is cross platform but doesn't require you to have VLC installed to work.  Also caches songs locally even between rounds.
* Changed jukebox.txt to be jukebox.json, now can include artist information as well.  Must include the duration of songs as well.
* For HTML5 audio compatibility, use only MP3 files, its the only format supported on all browsers.
* Jukebox itself is also upgraded, instead of just repeating the same song over and over it can actually advance to the next song when one is done playing.  Has a few modes including random, next, and single song.
* Jukeboxes have a UI improvement, and have a volume control.
* Three new settings are added to global settings in character setup
  * Jukebox music on/off toggles jukebox music independently of normal station ambience.  Now you can hear ambience but not music. (or vice versa if you wanted...)
  * Jukebox music volume.  Control the relative volume of jukebox music.   Actual volume is player's configured volume * jukebox's configured volume.
  * Media player type.  Choose between WMP, VLC, and HTML5
* Fixes a few bugs in the /vg code.
2017-03-23 21:10:11 -04:00
Cerebulon
38571fb8bc Adds in-hand sprites to several items.
Hand labeller, light replacer, megaphone, binoculars, powersink, suit cooler and lantern.
2017-03-23 22:03:17 +00:00
Anewbe
a80ea977d1 Adds Boxcutters 2017-03-23 15:27:48 -05:00
Leshana
32437f2418 Fix mob.loc = X on spawn
* When spawning into the game (both latejoin and normal join) the job controller used loc = X  to set location.  This meant that Enter() was never called for entering the spawn location, and all other associated problems.
* This screws up the new jukebox music system because mob.lastarea is not set correctly.
* Fixed signpost teleporting for the same reason (nobody wants beach tunes playing forever)
2017-03-22 23:05:44 -04:00
Leshana
60285dad52 Fix mob.loc = X on spawn
* When spawning into the game (both latejoin and normal join) the job controller used loc = X  to set location.  This meant that Enter() was never called for entering the spawn location, and all other associated problems.
* This screws up the new jukebox music system because mob.lastarea is not set correctly.
* Fixed signpost teleporting for the same reason (nobody wants beach tunes playing forever)
2017-03-22 23:03:10 -04:00
MagmaRam
e3a87c1c78 Merge pull request #2985 from Anewbe/more_pdas
Adds rugged style PDAs
2017-03-22 19:42:19 -05:00
MagmaRam
d603394226 Merge pull request #3121 from Anewbe/borg_zap
Borg stun arm should work now
2017-03-22 19:42:01 -05:00
Leshana
f93141d7d3 Merge remote-tracking branch 'polaris/master'
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	vorestation.dme
2017-03-22 20:08:29 -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
88b5756977 Arokha SA Rework (Polaris) 2017-03-22 19:32:19 -04:00
Anewbe
2c9c3e208e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into heart_damage_2
# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/giant_spider.dm
#	code/modules/organs/blood.dm
#	code/modules/organs/internal/lungs.dm
#	code/modules/organs/organ.dm
#	code/modules/organs/organ_external.dm
2017-03-22 17:29:01 -05:00
Anewbe
538f91c202 Borg stun arm should work now. 2017-03-22 17:06:16 -05:00
Anewbe
38598f3aae Merge pull request #3118 from Neerti/3/6/2017_surface_map
Continues work on the surface map
2017-03-22 16:33:40 -05:00
Arokha Sieyes
9660186dfd Not So Simple Animals (#3103)
* Merge two not-really conflicts

Thanks git, that whitespace conflict was super important?

* DME merge

* Added defines for mobs used by simple animals.

* Lost a slime along the way

* Disable debug settings

* HONK!!!

* Remove redundant hostile decls

* Replace loc= with forceMove in old SA code

I guess I should think of the children.
2017-03-22 14:30:07 -05:00
nachomeep
e1554f323b Adds engineering + science crates (#3072)
* Adds engineering + scicrates.

* Enables the science crate

* Updates engineering crate icons.

* Inflatables don't need security.

* fixes RCD crates
2017-03-21 18:38:47 -05:00
Neerti
b571ed9c66 Continues work on the surface map 2017-03-21 16:11:13 -04:00
Arokha Sieyes
be9bcf81f0 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 2017-03-21 11:22:29 -04:00
Neerti
7d1245d180 Merge pull request #3113 from Anewbe/easy_communicators
Communicator QoL
2017-03-21 02:17:27 -04:00
Anewbe
c65588b099 Communicator QoL 2017-03-21 00:51:26 -05:00
Anewbe
f796914849 Fixes a thing with jetpacks 2017-03-21 00:27:31 -05:00
Anewbe
cb23c72d8d Adds the whetstone 2017-03-20 23:32:52 -05:00
Anewbe
04c4b14e4b Merge pull request #3110 from Leshana/jukebox-wires
Make jukebox controllable by its wires
2017-03-20 20:38:56 -05:00
Anewbe
ba321a3e5e Merge pull request #3109 from VOREStation/decals
Flooring decals should work more places
2017-03-20 19:32:10 -05:00
nachomeep
83cc019562 Fixes phoron sprites. (#3100)
* Fixes phoron sprites.

* Re-adds the phoron-tank changes for the vox???

* touches up tank sprites
2017-03-20 19:31:42 -05:00
Leshana
5c3172389e Make jukebox controllable by its wires
Added four extra hacking wires to the jukebox for Play, Stop, Next, and Prev.  The main purpose is to allow attaching of singallers for remote controlling the jukebox.
2017-03-20 19:01:33 -04:00
Leshana
7558b365ef Switch VOREStation jukebox to read track list from a configuration file.
Jukebox will read config/jukebox.txt to find its track list.  This means tracks can be added/removed without recompiling the server.
2017-03-20 18:37:30 -04:00
Leshana
476b85a489 Merges VOREStation jukebox into standard jukebox
Fixes #1184 by simply eliminating the "/vore" sub-type of jukebox.  Now that upstream jukebox has all of our hacking capabilities, we only need to sideways override New to update the songs list.
2017-03-20 18:31:55 -04:00
Leshana
d8c96082f4 Make jukebox controllable by its wires
Added four extra hacking wires to the jukebox for Play, Stop, Next, and Prev.  The main purpose is to allow attaching of singallers for remote controlling the jukebox.
2017-03-20 18:24:18 -04:00
Arokha Sieyes
c8e26b365a Flooring decals should work more places
Such as shuttles. A good example is the trader ship which has hazard stripes mapped in, which don't appear in the game because it doesn't work there.
2017-03-20 00:51:17 -04:00
Arokha Sieyes
dbd44547bb Flooring decals should work more places
Such as shuttles. A good example is the trader ship which has hazard stripes mapped in, which don't appear in the game because it doesn't work there.
2017-03-20 00:48:49 -04:00
Arokha Sieyes
6dd4339abe Move the houseboat to z4
Also coincidentally provides tcomms to that level because it's really part of the same asteroid, though they can be turned off.
2017-03-20 00:48:00 -04:00
Anewbe
e2b3f0b9c1 Merge pull request #3106 from Leshana/vplk-thrown-objects-hit-windows
Fix thrown objects hitting windows not in their path
2017-03-19 21:38:22 -05:00
Anewbe
b5866d5876 Merge pull request #3088 from Leshana/huhbots
Ports Bot Patrolling back to Polaris (Plus bot fixes)
2017-03-19 16:09:32 -05:00
Leshana
ef52ccbe4d Fix thrown objects hitting windows not in their path
* Fixes windows counting as blocking the entire tile for thrown objects when they don't.
* Same thing for windoors, which have the same problem.
2017-03-19 17:06:38 -04:00