Commit Graph

8444 Commits

Author SHA1 Message Date
DZD
3939abaf5d Fix Conflicts and Sync with Upstream
Fixes conflict in icons/obj/gun.dmi by importing sprites added by #172
2015-01-16 17:07:22 -05:00
DZD
475ca3f666 Wizard Update Part 8
- Fixes horsemask spell to work on non-human races.
- Removes ability of Summon Item to mark and recall brains due to
problems with organ system.
- Makes weeping angels turn back to their human form after Flesh to
Stone wears off if they were created via F to S and the Staff of
Animation. (/tg/ port)
2015-01-16 16:39:12 -05:00
Markolie
28d55b9b42 Labor ore chance changes 2015-01-16 22:34:19 +01:00
Markolie
8386e32038 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	maps/cyberiad.dmm
2015-01-16 21:55:16 +01:00
Markolie
e59a94a8a1 Constructable newscaster, labor camp overhaul, other fixes 2015-01-16 21:50:33 +01:00
Fox-McCloud
803f472085 Tweaking of Movement Speed 2015-01-16 15:28:03 -05:00
Fox-McCloud
be0c0929b4 Merge pull request #170 from Markolie/master
Blob event fix, mapfix, AI/robot fix
2015-01-15 22:02:54 -05:00
Fox-McCloud
73d59113c3 Kinetic Accelerator 2015-01-15 21:58:51 -05:00
Markolie
3babba9752 Remove auto shuttle recall, on second thought it will not work well 2015-01-16 01:45:37 +01:00
Markolie
5646a9cc69 Blob event fix, mapfix, AI/robot fix 2015-01-16 01:42:56 +01:00
Fox-McCloud
baa88a7463 Fixes 2015-01-15 19:42:15 -05:00
DZD
5307d376da Wizard Update Part 7
(That last commit was supposed to be Part 3, not 6, but might as well
roll with it)

- Ports over the summon item spell from /tg/, it allows the wizard to
mark an item and then later recall it to his hands. If it is within
another item, that item will be recalled with the marked item inside.
- Removes RNG max charge variation on staffs, most staffs will now have
6 max charges (Rather than a 25% chance of 8, 50% of 4, and 25% of 3),
the exception being the Staff of Door Creation and Staff of Chaos, which
each have 10 charges.
- Adds summonitem to Summon Magic.
- Summon Guns/Magic now cost 1 spell slot each once again.

All ported from /tg/ with the exception of the Summon Guns/Magic cost
changes, as well as the remove of staff charge variation.
2015-01-15 17:05:49 -05:00
DZD
62c76ba2ef Wizard Update Part 6
- Attempt to fix back sprite for new staffs.
- Fireball wand now has a proximity detonation similar to the fireball
spell.

Ported from /tg/.
2015-01-15 15:50:10 -05:00
DZD
9af973a835 Wizard Update Part 2
- Adds in_hands for the Staff of Chaos and Staff of Door Creation
- Adds back sprites for said staffs, although they do not actually
appear for whatever reason, back sprites for older staffs also do not
appear.
- Adds unique sprites for the two staffs.

Ported from /tg/.
2015-01-14 22:30:51 -05:00
DZD
1c3d247aca Wizard Update Part 1
- Wands will no longer display a missing sprite if you try to fire one
while it is drained. (Only change that wasn't ported from /tg/)
- When using a staff of change on somebody, you can now turn them into a
goat or space bats, and when turning them into a cyborg, there is a
chance of that cyborg being a syndicate cyborg.
- Ports over page-based UI for the Wizard's spellbook from /tg/.
- Ports over the Wand Belt, Staff of Chaos, and Staff of Door Creation
from /tg/. The Wand Belt contains several useful wands, however all of
them have limited charges. The Staff of Chaos will cause a different
projectile spell effect each time it is cast, and can currently imitate
any of the wands. The Staff of Door creation will create wooden doors
over any solid turf they contact, doing so removes said turf.
- Mind swap will no longer remove spells from the wizard due to RNG.
- The charge spell will no longer damage the charge of weapons that
normally recharge by themselves.
- Adds Staff of Door Creation to the Summon Magic list, removes the
staff of change from the normal Summon Magic list and makes it part of
the special list
- If Summon Magic rolls to create an item on the special list, it will
create that item once, and will no longer create anything else from the
special list. (List consists of the Staff of Change, Staff of Animation,
Wand Belt, Staff of Chaos, and Contract).
2015-01-14 21:56:39 -05:00
Fox-McCloud
d9c99bc0f9 Merge pull request #168 from Markolie/master
R&D fix
2015-01-14 01:28:43 -05:00
Markolie
ebfe5eea92 R&D fix 2015-01-14 06:19:01 +01:00
DZD
8a03f88923 Minor Slime Additions
- Injecting slimes with plasma will increase their chance of mutating,
up to 50%.
- Injecting slimes with inaprovaline will decrease their chance of
mutating, this can reach 0%.
- Injecting a grey slime core with water will produce inaprovaline
inside the core.
- You can feed slimes plasma bars to make them more friendly, this does
NOT work the same way as pink slime extracts, but rather like feeding
them a monkey and punching the monkey to unconsciousness.
- Adds gold slime core + blood reaction, will spawn a mob that plasma +
gold core reactions normally spawn, but the mob will not be hostile.
This does not prevent space bears from becoming VERY pissed off if you
pet them.

All shamelessly ~~open source stolen (thefted?)~~ ported from /tg/.
2015-01-13 22:24:13 -05:00
Fox-McCloud
5db0870baf Merge pull request #164 from TheDZD/minor-fixes
Paperwork NT Logo Fix
2015-01-13 17:19:54 -05:00
DZD
bee904d99f Paperwork NT Logo Fix
- Fixes the problem where the image for using [logo] in paperwork was
not appearing correctly.
2015-01-13 17:08:55 -05:00
Fox-McCloud
02858f3406 Merge pull request #162 from Markolie/master
Changeling DNA fixes
2015-01-13 17:05:41 -05:00
Fox-McCloud
159bf0f56c Flashbang-Headsets 2015-01-13 16:33:49 -05:00
Markolie
6a0d3a60b7 Changeling DNA fixes 2015-01-13 20:17:00 +01:00
Fox-McCloud
05f19808a5 Merge pull request #161 from Markolie/master
Simplify and cleanup IPC/defib revival after messy fixes
2015-01-13 14:00:20 -05:00
Markolie
b3075f0704 Simplify and cleanup IPC/defib revival after messy fixes 2015-01-13 17:33:46 +01:00
Fox-McCloud
af07c79a92 Merge pull request #160 from Markolie/master
Bug fixes
2015-01-12 21:43:48 -05:00
Markolie
548ad9a5ca Defib/IPC fix? 2015-01-13 02:48:42 +01:00
Markolie
9986c03acb Bluespace anomaly fix 2015-01-13 02:18:35 +01:00
Markolie
8163056147 Let drained robots move 2015-01-13 01:44:03 +01:00
Markolie
5dff15fd56 Remove AI intercept from spam event 2015-01-12 20:44:03 +01:00
Fox-McCloud
f2ed2c403d Merge pull request #159 from Markolie/master
Malf AI lockdown fix, mapfix
2015-01-11 23:32:27 -05:00
Markolie
d1eadab31c Away mission fix 2015-01-12 04:29:53 +01:00
Fox-McCloud
efa01b525a Merge pull request #158 from Markolie/master
Major map overhaul, remove customs officer/nanotrasen recruiter
2015-01-11 20:31:19 -05:00
Markolie
60e18d0c0e Major map overhaul, remove customs officer/nanotrasen recruiter 2015-01-12 02:23:45 +01:00
Bone-White
f8302889d4 Merge pull request #1 from ParadiseSS13/master
Downstream merge
2015-01-11 17:36:57 +00:00
Bone White
17e0193b9e Cult hud on deconversion fix
Fixes the long-standing bug which meant that a client's icon over their
mob was not removed when deconverted, leading to mass confusion.
2015-01-11 09:02:28 +00:00
Markolie
fc7f00baba Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-01-11 06:05:25 +01:00
Markolie
c5696683ad Ventcrawl fix 2015-01-11 05:47:09 +01:00
Fox-McCloud
be1d527069 Borg Modules 2015-01-10 21:41:41 -05:00
DZD
29d572ee23 Kitchen Food Processor Nerfs
- The cereal maker, deep fryer, and the grill can only process food
items instead of almost anything.
- Deep frying and cerealizing food add 3 nutriment from 30.
- Ice cream cones have a reagent storage volume of 50 from 300.
2015-01-10 20:14:07 -05:00
Fox-McCloud
1e1e0b88c1 Merge pull request #150 from Markolie/master
Fix alien observer picking
2015-01-10 17:47:07 -05:00
Markolie
04ab12bdb3 Fix alien observer picking 2015-01-10 23:44:53 +01:00
Fox-McCloud
e8bda25149 Merge pull request #148 from Markolie/master
Vox Heist port from Bay, bug fixes
2015-01-10 14:43:48 -05:00
Fox-McCloud
2e573ff10e Merge pull request #149 from SamCroswell/master
Ninja Nerfs
2015-01-10 13:59:33 -05:00
SamCroswell
3b7e95ba5f Ninja Nerfs 2015-01-10 13:50:44 -05:00
Markolie
31fa043343 Not sure why I included this file, removing 2015-01-10 07:39:37 +01:00
Markolie
ae54430e6a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	maps/cyberiad.dmm
2015-01-10 06:24:55 +01:00
Markolie
ced499edc3 Vox Heist port from Bay 2015-01-10 06:21:21 +01:00
Fox-McCloud
bd2a59c9c2 Merge pull request #147 from Fox-McCloud/Movement-Speed-Tweaks
Movement speed tweaks
2015-01-09 23:02:56 -05:00
Fox-McCloud
9f24f8efd6 Movement Speed 2015-01-09 22:26:21 -05:00