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
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
Fox McCloud
dfa46a3181
Merge pull request #6686 from MarsM0nd/Bags
...
Small backpack sprite fix
2017-03-05 02:57:21 -05: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
Crazy Lemon
0d5d8e6cbe
Merge pull request #6597 from davipatury/wires-ui
...
Wires Nano-UI-ification
2017-03-04 10:21:19 -08:00
Crazy Lemon
5e1bd050f8
Merge branch 'master' into adminin
2017-03-03 23:23:40 -08:00
davipatury
d78d800d8a
Tank dispenser nano-ui.
2017-02-27 19:14:20 -03:00
uraniummeltdown
d0d2c63f30
remove trailing returns, alter checks, setdir, light_range
2017-02-27 15:03:28 +04:00
uraniummeltdown
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
Fox McCloud
8729dff99e
Merge pull request #6588 from Crazylemon64/random_barrier
...
Adds a random barrier for use in mapping
2017-02-26 17:27:20 -05:00
Crazy Lemon
e6e3ebd462
Merge pull request #6599 from davipatury/datacore-effect
...
Refactors datacore into a datum
2017-02-26 09:38:56 -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
davipatury
97b9e17955
Datacore refactor.
2017-02-25 22:31:19 -03:00
davipatury
a3a1775696
Wires nano-ui.
2017-02-25 21:51:28 -03:00
Fox McCloud
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
Fox McCloud
fbed82b080
Merge pull request #6570 from SamHPurp/no-ghost-spin
...
Refactors the Chair Rotate verb
2017-02-25 06:51:57 -05:00
Sam
83e616d8d8
Removes a superfluous return
...
Hopefully the final change..
2017-02-25 09:08:41 +00:00
Fox McCloud
1044b2b84d
Merge pull request #6515 from Crazylemon64/fast_servermonitor
...
Telecomms monitor is speedier now
2017-02-24 23:25:47 -05:00
Crazylemon64
5b148e13e8
Adds a random barrier for use in mapping
2017-02-24 18:18:46 -08:00
Crazylemon64
2f8feff402
Refactors tcomms stuff a little
2017-02-24 18:10:08 -08:00
Sam
e1abe58da7
Fixes indentation
2017-02-24 20:09:17 +00:00
Sam
79d5d7dc0c
Removes an unnecessary 'else' statement
...
Tidies the code up a bit more
2017-02-24 20:05:59 +00:00
Fox McCloud
45c9a3e550
Merge pull request #6573 from Markolie/zefix
...
Fixes
2017-02-24 14:57:38 -05:00
Fox McCloud
8b1a53b2d0
Merge pull request #6536 from SamHPurp/dethroning
...
Moves crown to cargo crate
2017-02-24 14:54:12 -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
Sam
d376c1a5da
Now uses setDir
...
Tested, and didn't break anything.
2017-02-22 23:38:43 +00:00
Sam
cde421e0eb
Refactoring of the Rotate verb
...
removes a few unnecessary checks. Still not using setDir yet, as I have
yet to work out how it works. To come!
2017-02-22 23:07:18 +00: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
uraniummeltdown
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
Sam
5bc8c45e82
Stops ghosts from interacting with chairs
...
Removes the ability for ghosts to spin chairs.
2017-02-22 13:41:29 +00: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
481083dfca
Variable fix
2017-02-21 13:49:00 +01:00
Markolie
a23493af86
Remove as obj
2017-02-21 13:43:37 +01:00
Markolie
389890bb2d
Additional admin interaction additions
2017-02-21 13:26:18 +01:00
Markolie
3d86a56471
Fix recharge station overstacking things, megaphones being usable by mute people and ranged guardian cooldown
2017-02-20 17:30:29 +01:00
Sam
d3e3ed24a4
Dethrones captain, adds crown to hat crate
...
Removes crown from Captain locker & adds to collectible hat crate
2017-02-20 12:53:12 +00:00
uraniummeltdown
4c6472aa49
rotation for mime statue
2017-02-19 22:39:23 +04:00
uraniummeltdown
7628586ee6
adds mineral statues from TG, added statue recipes for minerals, breakdown sandstone->sand
2017-02-19 21:48:13 +04:00
