 Fox McCloud
|
6bfd4013c0
|
Merge pull request #6753 from uraniummeltdown/grilles
Grille Code Update
|
2017-03-15 07:48:17 -04:00 |
|
|
Fox McCloud
|
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
|
0fc0aac229
|
remove target argument from ex_act()
|
2017-03-14 15:20:33 +04:00 |
|
|
Crazy Lemon
|
4edee61021
|
Merge pull request #6739 from Kyep/gateway_wildwest_mines
Stops Wild West syndie mobs killing themselves with their own mines
|
2017-03-13 13:14:34 -07:00 |
|
|
uraniummeltdown
|
70c2a27d16
|
Merge branch 'master' into grilles
|
2017-03-12 16:52:13 +04:00 |
|
|
uraniummeltdown
|
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 |
|
|
Fox McCloud
|
1a23c8a199
|
Merge pull request #6746 from Markolie/zefix
Fixes
|
2017-03-12 03:42:06 -04:00 |
|
|
Fox McCloud
|
0fe2a135e4
|
Merge pull request #6728 from FlattestGuitar/click
Adds clicks to flashlights 🔦
|
2017-03-11 21:26:23 -05: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 |
|
|
Crazy Lemon
|
661939c145
|
Merge pull request #6691 from davipatury/rcl
Port's RCL from /vg/
|
2017-03-11 15:30:48 -08:00 |
|
|
Markolie
|
5c20a29b1d
|
Fix statue welding, fix firedoor message spam, fix slaughter candidate pick
|
2017-03-11 18:25:23 +01:00 |
|
|
Kyep
|
b6b1b3c0aa
|
Stops Wild West syndie mobs blowing themselves up on their own mines
🆑 Kyep
fix: Syndicate mobs in the Wild West are no longer so stupid that they
trip over, and die to, their own mines.
/🆑
|
2017-03-11 02:11:33 -08:00 |
|
|
Fox McCloud
|
3c7d990061
|
Merge pull request #6710 from uraniummeltdown/coverflags
Cleaned up clothing flags
|
2017-03-11 04:57:15 -05:00 |
|
|
Fox McCloud
|
d6da6e3f52
|
Merge pull request #6527 from davipatury/modular_computers
Port's TG's modular computers
|
2017-03-11 04:51:49 -05:00 |
|
|
uraniummeltdown
|
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 |
|
|
FlattestGuitar
|
8c9b1ab043
|
Adds clicks to flashlights
|
2017-03-10 17:21:09 +01:00 |
|
|
Markolie
|
a6a7cf9d36
|
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into zefix
# Conflicts:
# _maps/map_files/cyberiad/cyberiad.dmm
# code/game/jobs/job/job.dm
|
2017-03-10 12:42:37 +01: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 |
|
|
Mark van Alphen
|
93470e3570
|
Merge branch 'master' into zefix
|
2017-03-09 17:20:31 +01:00 |
|
|
davipatury
|
2a9bcde361
|
Fix conflicts.
|
2017-03-09 12:01:50 -03:00 |
|
|
Crazylemon64
|
38dc304e54
|
Adds nitpick and allows for transformer rotation
No actual sprites for the latter, so it's kind of doofy, but oops
|
2017-03-08 19:04:19 -08:00 |
|
|
davipatury
|
781e66ec52
|
Fix conflicts.
|
2017-03-08 12:57:45 -03: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 |
|
|
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
|
ceb14ef15d
|
Fix NODROP interaction with secure closets
|
2017-03-06 13:34:05 +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 |
|
|
Markolie
|
02c4cd26f4
|
Final fixes
|
2017-03-05 16:42:14 +01:00 |
|
|
Markolie
|
b787b8f8e4
|
Refactor mineral door code
|
2017-03-05 15:02:17 +01:00 |
|
|
Markolie
|
e6b39c3185
|
Fixes
|
2017-03-05 14:31:26 +01:00 |
|
|
Fox McCloud
|
dfa46a3181
|
Merge pull request #6686 from MarsM0nd/Bags
Small backpack sprite fix
|
2017-03-05 02:57:21 -05:00 |
|
|
davipatury
|
af6db09309
|
Merge remote-tracking branch 'origin/master' into modular_computers
|
2017-03-04 15:44:20 -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 |
|
|
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 |
|