Commit Graph

3728 Commits

Author SHA1 Message Date
Markolie
2cd437ee5f Fix window crushing 2015-01-19 18:35:45 +01:00
Fox-McCloud
09900a7b0c Merge pull request #188 from Markolie/master
Fix away mission atmos, bug fixes
2015-01-18 01:32:45 -05:00
Markolie
34a7bc645a Plasma iwndow coloring fix 2015-01-18 04:50:11 +01:00
Fox-McCloud
2a96330cf3 Merge pull request #186 from Markolie/master
Major atmos overhaul: scrubbers and pipes can now co-exist
2015-01-17 20:28:53 -05:00
Markolie
f7ce7e55df Major atmos overhaul: scrubbers and pipes can now co-exist 2015-01-18 02:24:24 +01:00
Fox-McCloud
ba4bfc7b31 Merge pull request #184 from TheDZD/magic
Wizard Bugfixes and One Spell Addition
2015-01-17 16:43:06 -05:00
DZD
c769177a73 Wizard Bugfixes
- Prevents the Mutate spell from being used on z-level 2, so you can't
refund the spell while it's in use for permahulk.
- Ports in repulse spell from /tg/, it pushes away movable objects and
mobs away from the wizards. Mobs within 5 tiles will be stunned for 2
seconds, and mobs in the same tile as the wizard are stunned for 5 and
take minor damage.
- Fixes forcefields and forcewall spell by porting over
/obj/effects/forcefields.dm from /tg/. (This also fixes the mime wall,
god help us all)
- Mime forcefield nerfed to a 5 second duartion, retains 30 second
cooldown. (Yeah, let's not have those last 30 seconds.)
2015-01-17 12:12:28 -05:00
Fox-McCloud
52aff55f4e Merge pull request #182 from Markolie/master
Blob event fix, give ERT bowmans
2015-01-17 00:06:20 -05:00
Markolie
2402e91028 Blob event fix, give ERT bowmans 2015-01-17 06:04:24 +01:00
Fox-McCloud
ad1614f737 Merge pull request #180 from Markolie/master
Shuttle fixes
2015-01-16 20:39:03 -05:00
Markolie
fde761f42a Rejuv fix 2015-01-17 02:37:46 +01:00
Markolie
fb7fc04f51 Shuttle fixes 2015-01-17 02:33:19 +01:00
Fox-McCloud
a1b5c0d609 Merge pull request #179 from Markolie/master
Bug fixes
2015-01-16 19:09:16 -05:00
Markolie
6737472a83 Cig fix 2015-01-17 01:06:53 +01: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
Fox-McCloud
baa88a7463 Fixes 2015-01-15 19:42:15 -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
159bf0f56c Flashbang-Headsets 2015-01-13 16:33:49 -05:00
Markolie
b3075f0704 Simplify and cleanup IPC/defib revival after messy fixes 2015-01-13 17:33:46 +01:00
Markolie
d1eadab31c Away mission fix 2015-01-12 04:29:53 +01:00
Markolie
60e18d0c0e Major map overhaul, remove customs officer/nanotrasen recruiter 2015-01-12 02:23:45 +01:00
Markolie
042ac20d5e Remaining 3 /tg/ away missions 2015-01-11 07:41:12 +01:00
Markolie
ca902cbede Curtains 2015-01-11 05:49:47 +01:00
Markolie
8867fa3f78 Blank PDA fix 2015-01-10 07:38:24 +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
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
DZD
7239fc2c40 Merge remote-tracking branch 'upstream/master' into pAI-Drone-Port 2015-01-07 15:48:29 -05:00
Markolie
2e37a88639 More verb fixes 2015-01-06 22:46:11 +01:00
Markolie
6ce5b379e4 Let AI transmit cryo/arrival messages when present, let AI change arrival message 2015-01-06 02:06:23 +01:00
Fox-McCloud
e23841c46f Rebalance Stamina 2015-01-05 06:53:48 -05:00
Fox-McCloud
ff2b7cedb2 Clothing Restructuring 2015-01-02 12:40:42 -05:00
Fox-McCloud
43af351d27 Odds and Ends 2015-01-01 21:05:50 -05:00
Fox-McCloud
a92921786f Clothing Update 2015-01-01 11:23:48 -05:00
Fox-McCloud
525bb1a96f Stun Changes 2014-12-30 12:30:14 -05:00
Markolie
54f1f1c14f First aid kit name fixes 2014-12-24 14:33:00 +01:00
Markolie
2f8be5a6cc Typo fix 2014-12-24 13:56:43 +01:00
Markolie
f03bbf8bc6 Bug fixes 2014-12-24 12:53:49 +01:00
Markolie
328fb13704 Attempted defib fix 2014-12-23 17:25:09 +01:00
Markolie
0027425ab9 Consistency in ERT equipment, give ERT PDA's so they can be messaged privately 2014-12-23 02:36:40 +01:00
Markolie
c8db120dce Transit tube pressure fix 2014-12-22 20:31:03 +01:00
Markolie
266b4cb113 R&D UI rework 2014-12-22 17:38:22 +01:00
Fox-McCloud
03c61ed3ab Foxes 2014-12-22 08:32:32 -05:00
Markolie
8a63f79e54 Sparks will now disappear properly 2014-12-22 00:15:58 +01:00