cd6b6a61d7
added dog beds craftable from 10 wood planks
2017-03-17 17:46:04 +04:00
b686cad0ce
robo hands aren't affected by shard cutting into hand
2017-03-16 16:20:46 +04:00
6ca139974d
glass shards now deal brute to your hand if not wearing gloves
2017-03-15 19:39:54 +04:00
6bfd4013c0
Merge pull request #6753 from uraniummeltdown/grilles
...
Grille Code Update
2017-03-15 07:48:17 -04:00
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
70c2a27d16
Merge branch 'master' into grilles
2017-03-12 16:52:13 +04:00
2af6b1de23
grille code updates from tg, removed attack_self() from rods they now use recipes, refactored grille (de)construction, added broken grille object for mapping, grilles can be damaged by throwing objs or mobs at them, also general code cleanup
2017-03-12 16:35:24 +04:00
0fe2a135e4
Merge pull request #6728 from FlattestGuitar/click
...
Adds clicks to flashlights 🔦
2017-03-11 21:26:23 -05:00
85260a72ba
plastic is not a mineral anymore, plastic flaps are deconstructible, new construction.dm construction defines
2017-03-12 06:09:29 +04:00
661939c145
Merge pull request #6691 from davipatury/rcl
...
Port's RCL from /vg/
2017-03-11 15:30:48 -08:00
3c7d990061
Merge pull request #6710 from uraniummeltdown/coverflags
...
Cleaned up clothing flags
2017-03-11 04:57:15 -05:00
d6da6e3f52
Merge pull request #6527 from davipatury/modular_computers
...
Port's TG's modular computers
2017-03-11 04:51:49 -05:00
9eb7eea1e9
removes fourth argument air_group of CanPass() as it's not used and is a leftover from FEA
2017-03-10 22:46:02 +04:00
8c9b1ab043
Adds clicks to flashlights
2017-03-10 17:21:09 +01:00
dd12fbe13a
new flags_cover var for clothes, adjust existing flags
2017-03-10 11:33:42 +04:00
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
2a9bcde361
Fix conflicts.
2017-03-09 12:01:50 -03:00
781e66ec52
Fix conflicts.
2017-03-08 12:57:45 -03:00
2ac164812c
Fox's suggestions.
2017-03-08 12:04:19 -03:00
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
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
f96c335d1f
Merge pull request #6704 from uraniummeltdown/hardsuit
...
Rename all "rigs" (hardsuits) to hardsuits
2017-03-07 23:35:07 -05:00
9594ec245b
Change CE belt path to /full with tools
2017-03-07 18:16:30 +01:00
2c23fbe34d
Forgot to commit tools
2017-03-07 18:14:04 +01:00
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
3aa1399995
Implement usesound/toolspeed
2017-03-07 16:46:28 +01:00
3b73053bc4
Tool fixes
2017-03-06 20:46:24 +01:00
2c8ca5079f
Comments
2017-03-06 13:07:13 +01:00
41d4c83f17
Refactors Money
2017-03-06 04:52:03 -05:00
5989862d37
Fix space
2017-03-05 23:30:41 +01:00
9ec1400ae1
Fix comments
2017-03-05 23:04:41 +01:00
9d9e957df1
Tool overhaul (usesound & toolspeed), wire descriptions/ghost interaction, add additional tools, refactor can(t)_hold
2017-03-05 19:53:20 +01:00
a913797bf1
RCL
2017-03-05 13:22:55 -03:00
dfa46a3181
Merge pull request #6686 from MarsM0nd/Bags
...
Small backpack sprite fix
2017-03-05 02:57:21 -05:00
af6db09309
Merge remote-tracking branch 'origin/master' into modular_computers
2017-03-04 15:44:20 -03:00
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
0d5d8e6cbe
Merge pull request #6597 from davipatury/wires-ui
...
Wires Nano-UI-ification
2017-03-04 10:21:19 -08:00
0c7ec9d330
Merge remote-tracking branch 'remotes/upstream/master' into statues
...
# Conflicts:
# _maps/map_files/cyberiad/cyberiad.dmm
2017-02-27 14:27:24 +04:00
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
a3a1775696
Wires nano-ui.
2017-02-25 21:51:28 -03:00
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
fe5fb2c0f8
Merge remote-tracking branch 'upstream/master' into job_refactor_tg
2017-02-25 05:42:47 -08:00
1044b2b84d
Merge pull request #6515 from Crazylemon64/fast_servermonitor
...
Telecomms monitor is speedier now
2017-02-24 23:25:47 -05:00
2f8feff402
Refactors tcomms stuff a little
2017-02-24 18:10:08 -08:00
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
4bb1c57d7e
Conflict resolution
...
Unironically conflicting with another one of my PRs
2017-02-23 17:26:22 -05:00
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
fd3e7add93
Merge remote-tracking branch 'remotes/upstream/master' into statues
...
# Conflicts:
# _maps/map_files/cyberiad/cyberiad.dmm
2017-02-22 19:57:04 +04:00
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
67ee6fdd41
Laptop vendor, access tweaks and computer recipes.
2017-02-20 21:28:14 -03:00
uraniummeltdown