Commit Graph

11950 Commits

Author SHA1 Message Date
TheDZD
145f3c34dd Merge pull request #3314 from Fox-McCloud/blood-fix
Fixes Blood Death Redundancy
2016-01-21 18:22:14 -05:00
Fox McCloud
ccf7297da8 Merge pull request #3297 from Tastyfish/stop-hotwiring-the-tesla-you-tossers
Trained Poly on proper tesla engine use.
2016-01-21 18:21:48 -05:00
Fox-McCloud
0eea85a3c1 Fixes Blood Death Redundancy 2016-01-20 23:14:55 -05:00
TheDZD
3c987627d2 Merge pull request #3308 from Fox-McCloud/shotgun-handgun
Fixes Holstering a Few Guns
2016-01-20 18:53:27 -05:00
Fox-McCloud
31cf368706 Fixes Holstering a Few Guns 2016-01-20 18:39:45 -05:00
Fox McCloud
0c4b851da7 Merge pull request #3288 from FalseIncarnate/master
Cigarette Pack Functionality
2016-01-20 18:33:09 -05:00
Tastyfish
a16bdd45de Fixed wording for new Poly lines 2016-01-20 03:03:46 -05:00
Tastyfish
d50c1ee3da Trained Poly on proper tesla engine use. Player simple mobs can now hear headsets as applicable. 2016-01-20 02:13:38 -05:00
Fox-McCloud
131ca1d29b Fixes Items not Knocking Down 2016-01-20 00:49:23 -05:00
TheDZD
c7b9c3dc6e Merge pull request #3273 from Fox-McCloud/implant-refactor-II
Implant Refactor Part II
2016-01-19 19:11:10 -05:00
Fox McCloud
628b9a0aa6 Merge pull request #3280 from tigercat2000/tigers_found_a_new_obssession
Nano Obssession: Chromeless window, Styles
2016-01-19 18:59:37 -05:00
Fox McCloud
ec4d419d97 Merge pull request #3275 from DarkPyrolord/master
Vulpkanin Hardsuit sprites
2016-01-19 07:34:03 -05:00
FalseIncarnate
fca3996fcb Cigarette Pack Functionality
Adds the ability to put cheap lighters and individual matches into
cigarette packs at the cost of cigarette slots.
- A cheap lighter takes up the space of 2 cigarettes
- Zippos won't fit, they are too boxy.
- A match takes up the space of 1 cigarette.

Increases the w_class of all lighters (cheap, zippo, and special zippos)
from 1 to 2
- Still fits in pockets, just can't shove as many into a box as they
take up more space

Adds the ability to light and put out matches on your shoes.
- Good for when you lose that matchbox (or shove matches into a cig
pack) and need a light.
- Works on all shoes, from the humble brown shoes to the devious
syndicate magboots, and even the clown shoes.

Based on the suggestion from:
http://nanotrasen.se/phpbb3/viewtopic.php?f=12&t=6880
2016-01-19 02:49:00 -05:00
Tigercat2000
48349a3d9e Nano Obssession: Chromeless window, Styles
Does the following:
 - Adds 'chromeless' mode (NanoUI defaults to using this)
  - Window borders disappear, replaced by in-browser elements for
    minimize/close/move/resize.
  - You *must* move/resize slowly when using this mode, or it can have
    unexpected results, as the JavaScript cannot keep up as well as the
    native windows movement.
 - StatusGroups are now transparent: This looks nice. That's about it.
 - Body background switched to a .svg format for the NanoUI Logo.

 - Coder things:
  - Nano's JavaScript now has a new class, NanoWindow
   - NanoWindow handles all of the chromeless work. It'll be used to
     replace portions of NanoStateManager later.
2016-01-18 09:54:40 -08:00
Kyep
3325823aa9 Added Gamma/Delta/Epsilon alert icons 2016-01-18 02:31:24 -08:00
Fox McCloud
18b95c61fd Merge pull request #3268 from NTSAM/master
Adds an IPC screen
2016-01-18 02:44:41 -05:00
DarkPyrolord
2cd25927cd Vulpkanin Hardsuit spirtes 2016-01-18 20:34:10 +13:00
Fox McCloud
f9843fed28 Merge pull request #3195 from KasparoVy/Tail-Fix-A2
Tail Fix Take 2
2016-01-17 23:03:01 -05:00
Fox-McCloud
1bd3da4521 Implant Refactor Part II 2016-01-17 20:03:41 -05:00
KasparoVy
b6af0dd02b TAIL FIX! Squashing all those commits...
- Adds blank icons with standardized timings for species tail wagging,
used in icon generation.
- Fixes tails overlapping arms/limbs + gloves, etc. when facing EAST or
WEST.
- Ensures tails will overlap stuff as normal only when facing NORTH so
as to avoid unwanted interference with the base sprite.
- Tails now appear in ID cards, overlaying things correctly.
- Tails now overlay and are overlaid by things correctly in preview
icons.
- Modifies the positioning of tail icon generation in the ID card
preview icon generation file.
- Modifies the positioning of tail icon generation in the player
preferences preview icon generation file.
- Breaks limb generation into its own layer, breaks tail generation into
a second layer that can be overlaid by limbs.
- TAIL_LAYER will now overlay the NORTH direction sprite of a tail now,
while TAIL_UNDERLIMBS_LAYER gets all remaining directions.

**AIMS TO DO THE FOLLOWING:**
- *ELIMINATE THE ISSUE IN #3183 WITH DUPLICATE TAIL ICON GENERATION*
- *ELIMINATE THE ISSUE IN #3183 WITH TAILS WAGGING TOO FAST/INCORRECTLY*
- *ELIMINATE THE ISSUE IN #3183 WITH BODY ICONS NOT RENDERING*

Missed a spot

Occurred when reformatting the code and reducing the number of pointless
variables

Missed a spot 2

Crash Fix

Fixes Spontaneous Tail Overlapping Limbs

Tiny Unathi Sprite Corrections

One pixel on the Unathi right arm east direction sprite was miscoloured
(used left arm west direction as a reference), and the animated Unathi
tails previously did not meet the body while naked-- appearing to float.

Fixes both

Finalizes Changelog

Cleans up Vox puke

Accommodates Admin Overrides to body_accessory Species Checks & Fix

Does the above
Elaborating on accommodation: Species getting body accessories that
wouldn't normally be getting body accessories will inherit the
Vulpkanin's default animation template as those are currently the only
tails we have to worry about right now
Elaborating on Fix: Adds a default animation template for Vulpkanin in
body_accessory as the animation timings for Vulpkanin tails there are
different from those in effects/species.dmi

Unathi Static Tail Fix

Adjusts north-direction Unathi static tail sprite, now attaches to the
body in the correct location.

This PR is now on Sale!

Significantly cheaper.

Now, it will only generate tail icons on a per-direction basis if the
user's species is flagged to have a tail that is overlapped by limbs
(TAIL_OVERLAPPED).

Otherwise, it just uses the traditional cheapo method of icon
generation.

This way, we have fixed wagging Voxtails at a lower cost.

Even Cheaper

If the user's species isn't flagged to have a tail that needs to be
overlapped by limbs, it won't divert limbs into their own layer as it's
unnecessary. Tested by spawning a member of every species, walking
around to see if there was any directional issues, wagging and *swagging
all tails-- all is still working as it should be.
2016-01-17 19:32:22 -05:00
TheDZD
69f6c178aa Merge pull request #3251 from Fox-McCloud/implant-refactor
TG Implant Refactor/Overhaul
2016-01-17 18:37:50 -05:00
TheDZD
07df3700fa Merge pull request #3255 from tigercat2000/you_are_fucking_kidding_me_mate
Fix #3253, banning in lobby
2016-01-17 17:51:13 -05:00
Fox-McCloud
ffea6156de removes RNG 2016-01-17 00:37:48 -05:00
NTSAM
4407553202 Adds a new IPC screen
Adds a rainbow IPC screen.
2016-01-17 00:00:56 -05:00
TheDZD
b1e6f7c0a8 Merge pull request #3157 from DaveTheHeadcrab/blueshitgun
Blueshield: Advanced Stun Revolver
2016-01-16 23:17:54 -05:00
Fox-McCloud
ff9acaf730 Merge remote-tracking branch 'upstream/master' into implant-refactor 2016-01-16 20:52:36 -05:00
Fox McCloud
9e55d11fa9 Merge pull request #3178 from Aurorablade/insertlewdcommenthere
try to fix mindslave implant hud
2016-01-16 20:39:57 -05:00
Fox McCloud
05e2cb95a7 Merge pull request #3242 from Crazylemon64/lesser-changeling
Ports Morph
2016-01-16 19:52:33 -05:00
Fox McCloud
29cc8ec1c9 Merge pull request #3237 from KasparoVy/Spritefixes-And-Underwear
Spritefixes, Underwear and Berets
2016-01-16 19:52:17 -05:00
Fox McCloud
a29814f063 Merge pull request #3225 from Deanthelis/DroneLightTiles
Mag-Gripper Light Tiles
2016-01-16 19:52:04 -05:00
Kluys
a73420673b Fixes the nanofibre suit.
The nanofibre suit stops cycling through its modes once it reaches the
final mode.
Fixed.
2016-01-16 22:28:22 +01:00
Aurorablade
f40daffbe8 I FIXED IT 2016-01-16 15:50:43 -05:00
Tigercat2000
6d79878c6e Fix #3253, banning in lobby 2016-01-16 12:32:01 -08:00
Fox-McCloud
ec350a0b5c TG Implant Refactor/Overhaul 2016-01-16 01:50:10 -05:00
Deanthelis
5c803c312d Drone Light Tiles 2: Electric Boogaloo 2016-01-15 23:49:40 -06:00
Crazylemon64
64c92bf400 Ports Morph
Refactors a bunch of lesser antag mobs into gamemodes/miniantags
2016-01-15 16:31:58 -08:00
Fox McCloud
ad023ae93f Merge pull request #3226 from Crazylemon64/RAEGIN'-MAEGES!!!
Various Ragin' Mages fixes
2016-01-15 16:49:30 -05:00
TheDZD
962c8fbb6d Merge pull request #3240 from Fox-McCloud/tail-fix
Monkey Tail Fix
2016-01-15 16:47:38 -05:00
TheDZD
49a860ba2a Merge pull request #3241 from Fox-McCloud/monkey-creation
Monkey Cube Lag
2016-01-15 16:47:28 -05:00
Fox McCloud
12828298bc Merge pull request #3227 from KasparoVy/Ward-Takahashi
Ward-Takahashi Prosthetics
2016-01-15 06:04:58 -05:00
Fox-McCloud
0a9766314e Monkey Cube Lag 2016-01-15 05:08:54 -05:00
KasparoVy
2b976d5742 Ported Berets Part Deux
Obj icon name correction, renames a sprite to ensure the HoS keeps the
same colour beret as he had before, that's about it.
2016-01-15 04:22:27 -05:00
Fox-McCloud
483fe3e506 Monkey Tail Fix 2016-01-15 04:20:41 -05:00
KasparoVy
f21f3424ca Ports Bay/TG Berets
As requested!
2016-01-15 03:55:39 -05:00
KasparoVy
902337b828 Crosses Ts 2016-01-15 01:06:59 -05:00
KasparoVy
ab69e1a3a6 Missed a spot. 2016-01-15 00:51:56 -05:00
KasparoVy
b10a516bde Adds TG Underwear, Fixes Beret and NV Scigogs 2016-01-15 00:40:11 -05:00
TheDZD
c32d9cef2e Merge pull request #3233 from Fox-McCloud/human-creation-fix
Fixes Human Creation and Cuts its Cost
2016-01-14 20:20:41 -05:00
Fox-McCloud
6d48553980 Fixes Human Creation and Cuts its Cost 2016-01-14 19:21:39 -05:00
Jey
37091bb2f3 - removed the throttle on monkeycube expansion. 2016-01-14 17:34:09 -05:00