Commit Graph
4623 Commits
Author SHA1 Message Date
Sam 343d466287 Reverts NanoTrasen edits following convo with Fox/Regen 2017-03-19 21:31:42 +00:00
Sam db89c499ce Fixes some capitalisation stuff...
Pedantry!
2017-03-19 01:09:47 +00:00
uraniummeltdown 5180002295 add baseball bat item for 5 wood sheets, baseball burger, admin only reflector bat and homerun bat 2017-03-16 22:33:24 +04:00
uraniummeltdown b686cad0ce robo hands aren't affected by shard cutting into hand 2017-03-16 16:20:46 +04:00
uraniummeltdown 6ca139974d glass shards now deal brute to your hand if not wearing gloves 2017-03-15 19:39:54 +04:00
Mark van AlphenandGitHub 06b3460d6e Merge branch 'master' into findnreplace 2017-03-15 16:02:14 +01:00
KasparoVy cdc07fac4a Also fixes red crowbar's inhands being the wrong one. 2017-03-14 16:16:37 -04:00
Crazy LemonandGitHub 661939c145 Merge pull request #6691 from davipatury/rcl
Port's RCL from /vg/
2017-03-11 15:30:48 -08:00
Fox McCloudandGitHub 3c7d990061 Merge pull request #6710 from uraniummeltdown/coverflags
Cleaned up clothing flags
2017-03-11 04:57:15 -05:00
uraniummeltdown dd12fbe13a new flags_cover var for clothes, adjust existing flags 2017-03-10 11:33:42 +04:00
Fox McCloudandGitHub 9510fa9f6c Merge pull request #6711 from Crazylemon64/playercreation_assembly_line
Streamlines the ghost-to-player creation process
2017-03-09 21:30:22 -05:00
Mark van AlphenandGitHub cef5626f85 Merge branch 'master' into findnreplace 2017-03-09 17:32:42 +01:00
davipatury 2a9bcde361 Fix conflicts. 2017-03-09 12:01:50 -03:00
Fox-McCloud 9e94f2ceeb Fixes Power Tools Materials and Recators Laser Scalpels 2017-03-09 02:08:42 -05:00
davipatury 2ac164812c Fox's suggestions. 2017-03-08 12:04:19 -03:00
Crazylemon64 869c9b76c4 Streamlines the ghost-to-player creation process
Also refactors ERT equipment to be actual outfits instead of hardcoded
2017-03-08 05:49:49 -08: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
Mark van AlphenandGitHub b26d50d9f9 Merge branch 'master' into findnreplace 2017-03-08 10:37:10 +01:00
Kyep dd767648d0 Fox requests 2017-03-07 22:33:04 -08:00
Fox McCloudandGitHub f96c335d1f Merge pull request #6704 from uraniummeltdown/hardsuit
Rename all "rigs" (hardsuits) to hardsuits
2017-03-07 23:35:07 -05:00
Markolie 9594ec245b Change CE belt path to /full with tools 2017-03-07 18:16:30 +01:00
Markolie 2c23fbe34d Forgot to commit tools 2017-03-07 18:14:04 +01: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
Markolie 3b73053bc4 Tool fixes 2017-03-06 20:46:24 +01:00
Markolie 2c8ca5079f Comments 2017-03-06 13:07:13 +01:00
Fox-McCloud 41d4c83f17 Refactors Money 2017-03-06 04:52:03 -05:00
Markolie 5989862d37 Fix space 2017-03-05 23:30:41 +01:00
Markolie 9ec1400ae1 Fix comments 2017-03-05 23:04:41 +01: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
davipatury a913797bf1 RCL 2017-03-05 13:22:55 -03:00
Mark van AlphenandGitHub b0ded4b821 Merge branch 'master' into findnreplace 2017-03-05 12:09:52 +00:00
Mars 52b15a8f35 Small sprite fix
Gives the grey satchel the grey satchel sprite instead of the leather
one.
2017-03-04 19:36:30 +01:00
Kyep 3a44f7272e Nerfs Validhunting Chaplains
Changes:
- Nerfs nullrod damage from 18 to 14, spellblade/carpblade from 15 to
12. Nullrod keeps is many forms and abilities, but now you have to
choose between a weapon with holy effects, and really good damage. You
no longer get both.
- Chaplain no longer get crusader armor (roundstart riot armor!) in
their locker. Roundstart riot armor is rather silly, especially for
someone in the service department.

🆑 Kyep
tweak: Chaplains no longer get roundstart riot-grade armor. In addition,
their nullrods do less damage.
/🆑
2017-02-28 22:34:10 -08:00
Crazy LemonandGitHub 186edb14e7 Merge pull request #6468 from tigercat2000/job_refactor_tg
Ported /tg/'s outfit datums, refactored job controller to support them
2017-02-25 17:54:01 -08:00
Fox McCloudandGitHub 1e44336a3a Merge pull request #6555 from KasparoVy/vox-plasmaman-reagent-bsns
Reagent Oxygen is Toxic to Vox, Reagent Plasma Heals Plasmamen, Plasmaman Suit Autoextinguish & Plasmaman Exposure Burn Fixes
2017-02-25 17:11:08 -05:00
Tigercat2000 fe5fb2c0f8 Merge remote-tracking branch 'upstream/master' into job_refactor_tg 2017-02-25 05:42:47 -08: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
Markolie c5b897a951 Fix fax machine logout issue, fix card eject telekinesis interaction, fix death alarm follow link, fix flavor text not hiding when unknown, fix spacepod mining lasers 2017-02-22 18:24:43 +01: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
Markolie 6982014a6e Replace all BYOND text macros 2017-02-21 15:41:37 +01:00
Tigercat2000 e7023fd032 Refactored 'select equipment' to use outfit datums
Also moved outfit datum files to code/datum/outfits/, because I had
nowhere better to put all of the admin equipment- job stuff is still
with jobs
2017-02-17 16:17:59 -08:00
Krausus 4754d6b4b3 Fixes some sounds not being cached properly 2017-02-17 02:37:26 -05:00
Crazy LemonandGitHub 35653d0cee Merge pull request #6380 from uraniummeltdown/tanksprites
New Tank Sprites
2017-02-14 21:32:53 -08:00
Crazy LemonandGitHub 2e6f341f70 Merge pull request #6388 from DrunkDwarf/rcd-airlock-name2
Allows the Rapid Construction Device to set the name of a constructed Airlock
2017-02-14 13:34:21 -08:00
Markolie 078ca5dd92 Fix examine 2017-02-13 19:30:22 +01:00
Markolie 5c177320c3 Fix remaining welding tool inhands 2017-02-13 19:26:18 +01:00
Markolie e3eac9cdc7 Fix KA reskin mods and welding tool inhand 2017-02-13 19:12:26 +01:00
uraniummeltdown c4dd6f533f Merge remote-tracking branch 'remotes/upstream/master' into tanksprites
# Conflicts:
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
2017-02-13 21:01:58 +04:00
uraniummeltdown 0e96552cf8 added back and belt sprites, double tanks use old belt sprites 2017-02-13 06:24:51 +04:00