KasparoVy
585378aa0f
Fixes bug with Revenant darksight.
...
They could only see the default two tiles when it was defined after
see_invisible.
2017-03-26 06:10:36 -04:00
KasparoVy
eb43a48f67
Resolves conflicts with baseball PR.
2017-03-21 16:16:16 -04:00
Fox McCloud
9444666c18
Merge pull request #6818 from KasparoVy/deadlier-nuke
...
Nuke kills everybody (On the station Z-level).
2017-03-21 15:08:54 -04:00
KasparoVy
7d3f58c6bb
Lag reduction.
...
Also tweaks the rendering of the cinematic so it isn't interrupted by dust().
2017-03-20 22:42:21 -04:00
Fox McCloud
472bd7b887
Merge pull request #6813 from SamHPurp/fixes-vent-text
...
Fixes
2017-03-20 16:39:10 -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
king5327
09719f9f84
Brought the borer channel message up to date.
2017-03-19 17:02:46 -04:00
KasparoVy
1c556648c6
Keeping up with the Jones.
...
Nukeproof fridges.
2017-03-19 05:49:07 -04:00
KasparoVy
40c75f6b72
Nuke kills everything.
...
Even IPCs.
2017-03-19 03:08:22 -04:00
Sam
3af44d2a08
More typos fixed...
2017-03-19 05:13:20 +00:00
Markolie
e2a30cc7fe
Preference, changeling and record fixes
2017-03-16 23:39:26 +01:00
Markolie
a99b4ece15
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into zefix
2017-03-16 22:36:00 +01:00
Fox McCloud
6bfd4013c0
Merge pull request #6753 from uraniummeltdown/grilles
...
Grille Code Update
2017-03-15 07:48:17 -04:00
Fox McCloud
0103f297bb
Merge pull request #6741 from uraniummeltdown/supplytalisman
...
Adds 5 Runed Metal to Supply Talisman
2017-03-14 06:35:34 -04:00
Markolie
4edf69c3c0
Revenant nightvision fix
2017-03-12 20:59:28 +01: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
Markolie
255a6a1c17
Set poll time of cult demon to 100
2017-03-11 18:26:04 +01:00
Markolie
5c20a29b1d
Fix statue welding, fix firedoor message spam, fix slaughter candidate pick
2017-03-11 18:25:23 +01:00
uraniummeltdown
33548720eb
adds 5 runed metal to strong supply talisman
2017-03-11 15:36:47 +04: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
uraniummeltdown
dd12fbe13a
new flags_cover var for clothes, adjust existing flags
2017-03-10 11:33:42 +04:00
Mark van Alphen
93470e3570
Merge branch 'master' into zefix
2017-03-09 17:20:31 +01:00
davipatury
781e66ec52
Fix conflicts.
2017-03-08 12:57:45 -03: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
Crazy Lemon
fc272c33be
Merge pull request #6700 from Fox-McCloud/money-money-money
...
Refactors Money
2017-03-07 20:04:29 -08: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
Mars
5dd4d6d400
Better equip
...
replaces if statements with checked equip.
2017-03-07 10:39:33 +01:00
Markolie
3b73053bc4
Tool fixes
2017-03-06 20:46:24 +01:00
Markolie
15c96df7d2
Comments
2017-03-06 13:03:59 +01:00
Fox-McCloud
41d4c83f17
Refactors Money
2017-03-06 04:52:03 -05: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
Markolie
02c4cd26f4
Final fixes
2017-03-05 16:42:14 +01:00
Markolie
e6b39c3185
Fixes
2017-03-05 14:31:26 +01:00
Mars
6724eb8bed
Summon as necessary
...
Rewrites the tome to fit that equipment will only be spawned if needed,
and does so in the code.
2017-03-05 11:00:27 +01:00
Mars
187a70c249
derp
...
Correctly equips shoes to the shoes slot.
2017-03-05 10:40:15 +01:00
Mars
17049993d4
Gives Cult some more flavour.
...
Gives Cult cult shoes on the usage of the arming talisman, small change
to the description ot the talisman to account for the boots and that you
get the items in your backpack instead of them not getting spawned.
2017-03-04 20:13:03 +01:00
davipatury
af6db09309
Merge remote-tracking branch 'origin/master' into modular_computers
2017-03-04 15:44:20 -03:00
Fox McCloud
3ec0afeecf
Merge pull request #6639 from KasparoVy/multivox-plasmaverse
...
Properly Equips Plasmaman & Vox Multiverse Copies
2017-03-01 18:22:09 -05:00
Tigercat2000
c3bcd15c5e
fix nukeops
2017-03-01 14:44:09 -08:00
KasparoVy
88669090a6
Properly Equips Plasmaman & Vox Multiverse Copies
2017-02-28 04:37:10 -05:00
Tigercat2000
fe5fb2c0f8
Merge remote-tracking branch 'upstream/master' into job_refactor_tg
2017-02-25 05:42:47 -08:00
Markolie
f54ade7f46
Fix nuke ops victory declaration
2017-02-24 16:14:17 +01:00
Markolie
5c5889db74
Prevent cult from soul stoning manifested ghosts
2017-02-21 21:14:05 +01:00
davipatury
9eadc35e35
Comms program.
2017-02-21 12:37:28 -03:00
