Commit Graph

9304 Commits

Author SHA1 Message Date
Markolie
6737472a83 Cig fix 2015-01-17 01:06:53 +01:00
DZD
5a04ea1a79 Spelling Consistency Fixes AGAIN
This time without compiler-breaking #include statement changes.
2015-01-16 17:26:40 -05:00
DZD
002edceacc Revert "Spelling Consistency"
This reverts commit 3635367e03.
2015-01-16 17:20:21 -05:00
DZD
3635367e03 Spelling Consistency
Undoes changes made to spelling of the word "artifact/artefact" in order
to maintain parity throughout the spellbook, or at least the bits that
the user can see.
2015-01-16 17:10:34 -05:00
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
e59a94a8a1 Constructable newscaster, labor camp overhaul, other fixes 2015-01-16 21:50:33 +01: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
Markolie
3d3b1bcd1a Remove chaplain seeing observers 2015-01-16 02:00:22 +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
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
674851a760 Doors 2015-01-14 01:17:32 -05:00
Fox-McCloud
54555ec81c Merge pull request #166 from Markolie/master
ERT PDA
2015-01-13 21:09:59 -05:00
Markolie
f7e78a0bd9 Actually give the ERT a PDA (forgot to include it a while back) 2015-01-14 01:42:16 +01:00
Fox-McCloud
7e424f2a71 Merge pull request #165 from Markolie/master
Malf AI fixes, prevent IPC's from becoming vampires
2015-01-13 19:25:24 -05:00
Markolie
139685ceb6 Malf AI fixes, prevent IPC's from becoming vampires 2015-01-14 00:26:36 +01: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
74dc915569 Changeling monkey transform species fix 2015-01-13 20:31:56 +01: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
bde14e78b3 Atmos console emag fix 2015-01-13 18:51:41 +01:00
Markolie
b3075f0704 Simplify and cleanup IPC/defib revival after messy fixes 2015-01-13 17:33:46 +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
Markolie
da3a1e1769 Malf AI door lockdown fix (no longer locks all doors in the world, only the station's), mapfix 2015-01-12 04:06:08 +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
tkdrg
82a1a16b38 Fixes XSS vuln in changeling mimic voice
Report and picture by HoaxIT/ERIKHANSON
See https://github.com/tgstation/-tg-station/issues/6975
2015-01-11 20:10:37 -03:00
Bone-White
f8302889d4 Merge pull request #1 from ParadiseSS13/master
Downstream merge
2015-01-11 17:36:57 +00:00
Bone White
ec8f90efd9 Air Alarms now deconstructable
They also update to the correct area when constructed, and the runtime
errors (which I'm assuming were why deconstructing them was disabled)
have been fixed.
2015-01-11 11:18:58 +00:00
Markolie
042ac20d5e Remaining 3 /tg/ away missions 2015-01-11 07:41:12 +01:00
Markolie
fc7f00baba Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-01-11 06:05:25 +01:00
Markolie
ca902cbede Curtains 2015-01-11 05:49:47 +01: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
SamCroswell
3b7e95ba5f Ninja Nerfs 2015-01-10 13:50:44 -05:00
Markolie
8867fa3f78 Blank PDA fix 2015-01-10 07:38:24 +01:00
Markolie
fe51af3775 Malf end of round spam fix 2015-01-10 06:45:23 +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
DZD
e7e1a77e1f Space Pod Taser Change
Changes the instantstun electrode from the space pod tasers to the
disabler beam, this will allow them to shoot through windows and kill
the NPC mobs they find in space.
2015-01-09 18:26:27 -05:00
DZD
fba0657487 Merge remote-tracking branch 'upstream/master' into pAI-Drone-Port 2015-01-09 17:47:05 -05:00
Fox-McCloud
cb342a488b Merge pull request #139 from Markolie/master
Bug fixes, away mission port from /tg/
2015-01-09 08:07:41 -05:00
Fox-McCloud
96a89b4591 Bandolier 2015-01-08 21:20:51 -05:00
Markolie
c70a6c172b Away mission port from /tg/ 2015-01-09 00:12:16 +01:00
Markolie
c4da1e66d9 Fix wall smoothing 2015-01-08 19:44:56 +01:00
Fox-McCloud
81a4bfed43 Security Clothing 2015-01-07 23:11:52 -05:00