Commit Graph

19863 Commits

Author SHA1 Message Date
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
TheDZD
a89276a179 Merge pull request #3274 from Fox-McCloud/attack-fixes
Fixes Some Items Attacks
2016-01-18 19:58:15 -05:00
Fox-McCloud
f67959b571 cryo computer 2016-01-18 18:55:44 -05:00
Fox-McCloud
f512a00883 Fixes Swarmer Cryopod Eating 2016-01-18 18:17:59 -05:00
Fox McCloud
708d1eca39 Merge pull request #3269 from tigercat2000/back_to_the_beginning
Gibber stuff (and fixing a compile warning *glares at Aurora*)
2016-01-18 18:03:31 -05: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
Fox-McCloud
b4244b3921 Fixes Some Items Attacks 2016-01-18 01:25:10 -05: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
5a88ea74f0 Merge pull request #3262 from Tastyfish/wanted-photo
Added printing crew photo from security records
2016-01-17 21:04:29 -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
TheDZD
8df530d56e Merge pull request #3258 from Robertha89/patch-1
Increases Nuclear Challenge Time Limit
2016-01-17 17:50:03 -05:00
TheDZD
6db57df0a9 Merge pull request #3271 from Fox-McCloud/access-fix
Fixes Weapon Permit Access
2016-01-17 17:49:15 -05:00
TheDZD
e4120a68b0 Merge pull request #3264 from Fox-McCloud/elite-hardsuit-grammar
Fixes Elite Hardsuit Description
2016-01-17 17:48:39 -05:00
Fox-McCloud
5fa24db081 Fixes Weapon Permit Access 2016-01-17 08:29:24 -05:00
Tigercat2000
92f75423ad Prevent monkies in gibbers (breaks the animation), code styling 2016-01-16 22:03:06 -08:00
Fox-McCloud
ffea6156de removes RNG 2016-01-17 00:37:48 -05:00
Tigercat2000
ebd6877b4a Anyone ever heard of compile-testing? (or viewing the travis log) 2016-01-16 21:36:09 -08:00
NTSAM
4407553202 Adds a new IPC screen
Adds a rainbow IPC screen.
2016-01-17 00:00:56 -05:00
Fox-McCloud
0f97120830 Fixes Blueshield Copypaste 2016-01-16 23:25:22 -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
837ca759c9 Fixes Elite Hardsuit Description 2016-01-16 21:46:38 -05:00
Fox-McCloud
369ab2cd9c minor fix 2016-01-16 21:36:18 -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
fb50b53017 Merge pull request #3246 from Jey123456/altclickdeflate
alt click to deflate inflatable walls / doors.
2016-01-16 19:52:56 -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
Fox-McCloud
4558e0e8ae better pad 2016-01-16 19:48:13 -05:00
Tastyfish
60a6f1db52 Added printing photo from security records 2016-01-16 19:35:03 -05:00
Fox McCloud
d3639634c1 Merge pull request #3257 from Bram961/Kluysfluff-fix
Fixes the nanofibre suit.
2016-01-16 19:16:47 -05:00
Fox McCloud
0ef9700d88 Merge pull request #3236 from Tastyfish/morgue-maintenance
Made Starboard Emergency Storage -> Genetics Maintenance, maint door name parity
2016-01-16 19:08:42 -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
Robertha89
bcc65066ee Increases Nuclear Challenge Time Limit 2016-01-16 21:59:52 +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
8c229280d2 consistency helps 2016-01-16 04:44:56 -05: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
9d4f08385c Merge pull request #3230 from tigercat2000/BUTTS
Adds butts
2016-01-15 16:26:22 -05:00
Jey
189ac6f4e6 -small change 2016-01-15 14:10:47 -05:00
Tigercat2000
455d885ba3 NanoUI Interface: Fire alarm (ooh fancy) 2016-01-15 10:59:01 -08:00
Jey
6002ec00e1 simple quality of life tweak to the inflatable walls / doors.
Alt-click on an inflated one to deflate (same as the deflate option on right click)
2016-01-15 13:19:18 -05:00