Commit Graph

2537 Commits

Author SHA1 Message Date
davipatury
1673340c2d effect/effect/foam to structure/foam 2017-03-30 10:48:16 -03:00
davipatury
550fdd3ae3 effect/blob to structure/blob 2017-03-27 18:41:19 -03:00
Fox McCloud
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
8bdd31c4c2 Latest batch of fixes - bad ❄️ 2017-03-27 09:01:36 +01:00
Crazy Lemon
09f7b52f3b Merge pull request #6906 from Fox-McCloud/merge-oddities
Fixes Stack Merge Oddities
2017-03-26 23:27:58 -07:00
Sam
bbd453c038 Addresses Tigercats concerns pulls messages inline 2017-03-27 04:23:02 +01:00
Sam
4958b0a7d2 Fixes DNA Scrambling IPCs 2017-03-27 03:46:39 +01:00
Fox McCloud
88ae43709f Merge pull request #6913 from SamHPurp/Unlocked-APCs
Quality of Life: Newly built APCs come unlocked.
2017-03-26 18:24:10 -04:00
Fox McCloud
bce6befcd1 Merge pull request #6770 from KasparoVy/tools-inhands
Fixes and Adds some Inhand Icons for Tools, TG Tool Inhand Sprite Parity
2017-03-24 19:00:34 -04:00
Sam
dba6c293c7 Increases the number of construction permits 2017-03-24 21:26:38 +00:00
Fox-McCloud
9ed89ef7cd Fixes Stack Merge Oddities 2017-03-24 04:44:04 -04:00
Crazy Lemon
87e4993152 Merge pull request #6717 from Fox-McCloud/laser-scalpel-refactor
Fixes Power Tools Materials and Recators Laser Scalpels
2017-03-23 15:20:56 -07:00
Fox McCloud
d62e35d333 Merge pull request #6647 from Kyep/nerf_chaplain
Nerfs Validhunting Chaplains
2017-03-23 00:18:16 -04:00
Crazy Lemon
a3df2d2eb5 Merge pull request #6851 from Fox-McCloud/cleaning
Spring Cleaning
2017-03-22 21:16:52 -07:00
FlattestGuitar
c1fcb9a87c < 2017-03-22 09:24:03 +01:00
KasparoVy
eb43a48f67 Resolves conflicts with baseball PR. 2017-03-21 16:16:16 -04:00
Fox-McCloud
037db0bdf7 Spring Cleaning 2017-03-21 14:43:53 -04:00
Fox McCloud
8a257e425e Merge pull request #6789 from uraniummeltdown/playball
Baseball Bats, Baseball Burgers
2017-03-21 14:38:03 -04:00
Sam
e43cb810a8 More bits wew. 2017-03-20 06:37:56 +00:00
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
KasparoVy
cdc07fac4a Also fixes red crowbar's inhands being the wrong one. 2017-03-14 16:16:37 -04:00
Crazy Lemon
661939c145 Merge pull request #6691 from davipatury/rcl
Port's RCL from /vg/
2017-03-11 15:30:48 -08:00
Fox McCloud
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 McCloud
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
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
Kyep
dd767648d0 Fox requests 2017-03-07 22:33:04 -08:00
Fox McCloud
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
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 Lemon
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