ZomgPonies
06ba71d003
Superheroes update
2017-04-11 19:53:08 -04:00
Crazy Lemon and GitHub
ff271f7b29
Merge pull request #7061 from Fox-McCloud/damn-cells
...
Damn cells
2017-04-09 13:55:30 -07:00
Crazy Lemon and GitHub
cc649db525
Merge pull request #6894 from Fox-McCloud/abductor-hearts
...
Abductor Gland Rework and Abductor Updates
2017-04-09 13:40:01 -07:00
Fox-McCloud
5631d36ff8
Converts Most Destroys to use QDEL_NULL
2017-04-04 23:08:41 -04:00
Crazy Lemon and GitHub
c6abe7822b
Merge pull request #6961 from Fox-McCloud/garbage-collect-stuffs
...
Garbage Collection and Code Cleanup
2017-04-01 22:58:52 -07:00
Fox-McCloud
35ab7ada94
Refactors Cell Energy Values
2017-04-01 20:14:29 -04:00
Fox-McCloud
838d58b1a5
for fixes
2017-03-28 01:06:03 -04:00
Fox McCloud and GitHub
4d18372353
Merge pull request #6925 from SamHPurp/fixes-abductors
...
Refactors Stool/Bed/Chair deconstruction + adds Psych's bed recipe + bug fixes
2017-03-27 04:33:30 -04:00
Sam
8965ba9872
Misc grammatical fixes
...
Adds message to let people know when you're trying to yank out objects
from them
2017-03-27 06:16:24 +01:00
Sam
0b7a95933c
Refactors bed/chair/stool deconstruction + more
...
Add psych bed... fixes typos... fixes inconsistent deconstruction
amounts
2017-03-26 15:50:49 +01:00
FlattestGuitar
4445a34650
Merge branch 'master' into outfiterinos
2017-03-25 21:20:51 +01:00
FlattestGuitar
c0ac235704
Touching up the admin outfits...
2017-03-25 18:45:36 +01:00
Fox-McCloud
01466c02dc
Abductor Gland Rework
2017-03-23 02:33:00 -04:00
Fox McCloud and GitHub
d62e35d333
Merge pull request #6647 from Kyep/nerf_chaplain
...
Nerfs Validhunting Chaplains
2017-03-23 00:18:16 -04:00
Fox McCloud and GitHub
31f6bb205a
Merge pull request #6814 from Jovaniph/evaspriteupdate
...
Tajaran EVA Suit Sprites and Minor Updates
2017-03-20 16:41:59 -04:00
KasparoVy
467c7fa1ae
Fixes Glovesnipping
...
Attempting to snip gloves runtimed out because of that accidental
shift-key period business. Works again.
2017-03-20 05:34:25 -04:00
Jovan
9aed97a244
Tajaran EVA Suit and some updates
2017-03-18 21:29:39 -04:00
Jovan
3fde1afd65
Vox hats yaya
2017-03-18 04:20:56 -04:00
Fox McCloud and GitHub
b964485e08
Merge pull request #6785 from Jovaniph/unathieva
...
Unathi EVA Suit
2017-03-17 08:57:12 -04:00
Jovan
af62b3f3a7
Unathi EVA Suit
2017-03-16 08:25:52 -04:00
FlattestGuitar
603668fb23
Adds winter boots; adds workboots to the loadout system
2017-03-15 19:45:40 +01:00
Fox McCloud and GitHub
c6e3fe3cdb
Merge pull request #6734 from uraniummeltdown/plastic
...
Plastic is not a mineral anymore, plastic flaps can be constructed/deconstructed
2017-03-15 06:33:02 -04:00
uraniummeltdown
85260a72ba
plastic is not a mineral anymore, plastic flaps are deconstructible, new construction.dm construction defines
2017-03-12 06:09:29 +04:00
Jovan
65cb35fbb2
please no merge conflict.
2017-03-11 19:21:06 -05:00
Jovan
48caf853d5
forgot other file yaya
2017-03-11 16:51:04 -05:00
Jovan
f1188c0ecc
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise.git into vulpevasuit
2017-03-11 16:45:02 -05:00
Jovan
22db913d9f
conflict fixing.
2017-03-11 05:08:19 -05:00
Jovan
054a4ce3f1
Merge Fix?
2017-03-11 05:05:49 -05:00
Fox McCloud and GitHub
3c7d990061
Merge pull request #6710 from uraniummeltdown/coverflags
...
Cleaned up clothing flags
2017-03-11 04:57:15 -05:00
Jovan
19a44e7172
added vulpkanin eva suit
2017-03-11 02:09:16 -05:00
uraniummeltdown
04368ef0c5
removes Vox EVA suits, adds sprite_sheets and sprite_sheets_obj to regular EVA suits, added 2 more EVA suits to map in place of Vox ones
2017-03-11 10:39:56 +04:00
uraniummeltdown
dd12fbe13a
new flags_cover var for clothes, adjust existing flags
2017-03-10 11:33:42 +04:00
Markolie
acab5d5170
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into toolz
...
# Conflicts:
# code/game/objects/items/weapons/storage/bags.dm
# code/game/objects/items/weapons/storage/uplink_kits.dm
# code/game/objects/items/weapons/storage/wallets.dm
2017-03-08 10:45:16 +01:00
Fox McCloud and GitHub
f96c335d1f
Merge pull request #6704 from uraniummeltdown/hardsuit
...
Rename all "rigs" (hardsuits) to hardsuits
2017-03-07 23:35:07 -05:00
uraniummeltdown
dc6f9f5506
rename all hardsuits (called rig in multiple places) to hardsuit, rename rig.dm to hardsuit.dm, adjust icon states from rig to hardsuit, move paranormal hardsuit mob sprites out of own file, add wiz hardsuit helm and suit inhands
2017-03-07 20:55:43 +04:00
Markolie
3aa1399995
Implement usesound/toolspeed
2017-03-07 16:46:28 +01:00
Fox-McCloud
41d4c83f17
Refactors Money
2017-03-06 04:52:03 -05:00
Markolie
9d9e957df1
Tool overhaul (usesound & toolspeed), wire descriptions/ghost interaction, add additional tools, refactor can(t)_hold
2017-03-05 19:53:20 +01:00
Kyep
257a34e821
Re-adds crusader armor with nerfed stats
2017-02-28 23:12:09 -08:00
gt33 and GitHub
0f1b2b599d
Fixes the Mime's EVA Suit description
2017-02-28 04:27:36 -05:00
Fox McCloud and GitHub
cdf5b55ac1
Merge pull request #6535 from KasparoVy/rigfix
...
Fixes Rigsuit NODROP-Related Bug and Improves Rigsuit Verb Readability
2017-02-26 18:04:51 -05:00
KasparoVy
3c24f6e255
Dumbs Down Plasmaman Suit Reloading & Amends Plasmaman Suitless Ignition
...
Plasmaman suits no longer have an in-depth system by which their
autoextinguisher can be replenished, but a simple one.
Plasmamen now combust in the same circumstances regular gasous plasma
will as defined in LINDA code.
2017-02-24 02:37:20 -05:00
KasparoVy
4bb1c57d7e
Conflict resolution
...
Unironically conflicting with another one of my PRs
2017-02-23 17:26:22 -05:00
KasparoVy
864260efde
Removes Snowflake Name-checks and Amends Plasmen Suit Extinguish Messages
...
Removes a bunch of bodyflags from Armalis that they really shouldn've
had as well.
2017-02-22 01:44:15 -05:00
KasparoVy
9dad350329
Desnowflakes the Special Reagent Handling & Amends+Completes Autoextinguish & Fixes Plasmaman Immolation Immunity Bug
...
- Moved Vox and Plasmamen special reagent handling to the Species datum
to avoid snowflaking in reagent code
- Removed the AUTOEXTINGUISH flag and turned it into a var to conserve
flags
- Adds Plasmaman EVA suit auto-extinguisher reloading. Eject the
depleted cartridges with an action button and fill them as you would a
fire extinguisher, then just slot them back into the suit.
- Fixes a bug where having NOBREATHE cured a Plasmaman of burning when
exposed to atmosphere.
- Fixes a bug where Plasmamen would burn in space or in totally-Plasma
environments. Inspired by /vg/station.
2017-02-22 00:12:01 -05:00
KasparoVy
829dcf4229
Oxygen is Toxic to the Vox, Plasma Heals Plasmamen, Plasmaman Suit Autoextinguishes, Oxygen Burns Plasmamen
...
Oxygen is toxic to the Vox (as toxic as plasma).
Plasma healing plasmaman from swindly @
https://github.com/tgstation/tgstation/pull/24209
Plasmaman suit auto-extinguishing actually does something now.
Oxygen burns Plasmamen.
2017-02-21 07:26:04 -05:00
KasparoVy
abae9335d2
Fixes Rigsuit Bug and Improves Rigsuit Verb Readability
2017-02-20 07:30:14 -05:00
KasparoVy
11d759550c
Moves Species-Specific Object Icons into their own Files, Fixes Armalis Equipment Bug
...
All species-specific clothing icons (obj and worn) are now in their own files instead of cluttering up the main ones. I didn't do the Skrell helmets/whatevers because Humans can wear them too.
Fixes a bug where the 'select equipment' debug verb wouldn't correctly equip Armalis if you selected the 'Vox' option. Also corrects an issue where it gave the Armalis two uniforms. Adds a placeholder invisible uniform icon state for the Armalis so Admins can use 'em for events and do uniform-related things without having to deal with terribly awkward icons.
2017-02-20 07:08:19 -05:00
KasparoVy
006cff12be
Moves Vox/Armalis/Plasmaman/Unathi Helmets, Suit and Boot Icons from Main Files into Species-specific Files
...
Because feet.dmi, head.dmi, suit.dmi and uniform.dmi are getting pretty
big.
2017-02-19 19:55:20 -05:00
KasparoVy
30749142e8
Adds some Vox Helmet Sprites and Other Small Tweaks
...
Slightly tweaks Vox knight armour sprites (templar untouched).
Adds toggling of face-shield on gladiator helmet.
Adds the following helmet sprites for Vox:
- Justice 1 & 2
- NVG Helmet
- Sci-goggle Helmet
- Materials-goggle Helmet
- Meson-goggle Helmet
- Syndicate Helmet
- Thermal-goggle Helmet
- Riot Helmet
- Thunderdome Helmet
- Roman Helmets (regular & legionnaire)
- Gladiator Helmet
- Red/Blue Lasertag Helmets
- Blob Hat
- Knight Helmets (Templar, Grey & RGBY)
2017-02-19 01:42:40 -05:00