Commit Graph

9304 Commits

Author SHA1 Message Date
SamCroswell
4083544239 Conflict Fix 2015-01-24 01:25:12 -05:00
SamCroswell
ca960c02d4 Disallow IPC Genetics Use
IPCs can no longer gain genetic powers, or use injectors. It was
requested I make them unable to use injectors at all because they take
toxins damage they can never fix from using the injectors, and it would
be pointless for them to use them with genetics powers not working on
them anymore.
2015-01-24 01:17:49 -05:00
SamCroswell
b19b7fc973 Reverts Incendiary Mitochondria
Instead of incendiary mitochondria being an uncounterable and
untraceable method of dealing massive mounts of burn damage to someone,
it has been reverted to what the power was originally.  It will now
ignite the user when cast. I realize this isn't very useful, but the
alternative is the power being removed altogether.
2015-01-24 01:16:00 -05:00
Fox-McCloud
7dced99c6f Merge pull request #209 from Fox-McCloud/Odds-and-Ends
Odds and ends
2015-01-23 22:19:57 -05:00
Fox-McCloud
1a395dce03 Odds and Ends Changes 2015-01-23 21:57:00 -05:00
DZD
d7f322d4ca Syndicate Strike Team Weaponry Changes
- Replaces the Syndicate Strike Team's pulse rifles with syndicate LMGs.
- Replaces the empty box in SST member's bags with an extra clip of LMG
ammo.
- Gives SST members each an emag to offset the fact that they no longer
have pulse rifles for destroying walls.
- Moves Summon Item .dm file to be with other spell files.
2015-01-23 20:07:55 -05:00
DZD
2f401fd7d3 Syndicate Strike Team and Deathsquad Improvements
- SST and DS members now get advanced magboots instead of combat boots,
with the SST getting ones that share a sprite with the blood-red
magboots.
- SST and DS members now get a fully pressurized double emergency oxygen
tank, as the emergency oxygen tanks they were getting were laughably
inadequate.
- Filled double emergency oxygen tank is a subtype of the 1/3 filled
one, so those are left unchanged.
- SST space suits are now as armored and acid-proof as DS space suits.
- SST space suits are now a subtype of the two specific colored
Syndicate spacesuits they used, so the originals remain unchanged, as
they spawn on away missions.
2015-01-23 10:53:39 -05:00
FalseIncarnate
fa2e1be750 Botany Plant Additions
> Reintroduced a number of previously removed plants:
+ Tobacco
+ Space Tobacco
+ Tea Aspera
+ Tea Astra
+ Coffee Arabica
+ Coffee Robusta
+ Moonflower
+ Novaflower
+ Koibean

> Fixed a typo preventing the mutation of Blood tomatoes into Killer
Tomatoes.
> Added an additional version of both tea and coffee powders and drinks.
> Added additional tea and coffee recipes to make and utilize the new
versions.
> Added coffee arabica, tobacco, and tea aspera seeds to seed vending
machines.
2015-01-23 02:24:06 -05:00
DZD
532a3707de Fix Spacepod Battery Charge Display
- Fix for spacepod status menu not displaying charge % of any battery
cell that was not a high capacity cell. Spacepod code is still an utter
mess.
2015-01-22 21:43:23 -05:00
DZD
72f1d17cfa Merge remote-tracking branch 'upstream/master' into logging-improvements 2015-01-22 20:49:55 -05:00
DZD
b39a052a7a More Adminlogs
- Adds use_log list logging to AI/borg alt + click door shocking.
- Adds use_log list logging to PA control computer (Turning on,
increasing power, decreasing power).
- Adds use_log list logging to robotics control computer (borg full
destruct and single borg destruct).
2015-01-22 19:25:57 -05:00
DZD
2d84ebed13 Machinery Use Logging
- Implements use logging (attack log-like var list) to machinery,
viewable in VV, can be used within any machine.
- The virus incubator in virology logs whenever somebody transfers a
virus to a blood sample, as well as that virus' symptoms.
2015-01-22 14:36:11 -05:00
Fox-McCloud
edb6399552 Merge pull request #198 from SamCroswell/master
Add Smoothed Dark Windows, Ninja EMP Cost Increase
2015-01-21 21:39:46 -05:00
Fox-McCloud
43e3c3e33f Merge pull request #204 from TheDZD/minor-fixes
Admin Logs and Rev Fix [Ready To Merge]
2015-01-21 20:53:59 -05:00
DZD
81e5103738 Fix Missing Parenthesis
Formatting fix.
2015-01-21 20:38:57 -05:00
DZD
54ec88707f Admin Logs and Rev Fix
- Fixes Space Pod Pilot being a candidate for Rev Head
- Adds attack and admin logs to borer mind control (including when the
host takes control back).
- Adds admin logs and improves attack logs on pyrokinesis (requires
testing).
2015-01-21 19:38:11 -05:00
Markolie
3ac9fba693 Fix reinforced floor showing pipes 2015-01-22 01:34:38 +01:00
Markolie
09321d6c0b Use station_name proc where possible, mapfix 2015-01-21 23:37:05 +01:00
Markolie
956f2ba703 Event overhaul from Bay, atmos fixes 2015-01-21 23:05:59 +01:00
Markolie
183362eabd Proper pipe freezer fix, give sec spacepod laser 2015-01-21 20:04:59 +01:00
Fox-McCloud
062b8632cb Merge pull request #199 from TheDZD/minor-fixes
Vampire and Borer Patch [Redy to Merge]
2015-01-20 17:55:09 -05:00
DZD
cfc06d13dd Chapel now makes vampires extra crispy
- Vampires burn similar to being in space while in the chapel.
2015-01-20 13:54:03 -05:00
DZD
d02dbd4b5e Minor Bugfixes
- Fixes vampire powers being usable in the chapel.
- Fixes borer DC bug (needs testing with 2 clients)
- Allows borer to cancel Inject Chemicals
- Borer Inject Chemicals now shows cost in the verb name.
2015-01-20 12:11:41 -05:00
Markolie
6e598a2c25 Prevent IPC's from becoming changeling during traitorchan 2015-01-20 04:35:45 +01:00
SamCroswell
c771ce1354 Add Smoothed Dark Windows, Ninja EMP Cost Increase
- The Ninja's EMP now costs an additional 1,000 to perform.

- Add smoothed dark shuttle windows, replace the Nukeops shuttle cockpit
window with smoothed shuttle windows.

- Remove the AI cameras from the Xeno shuttle, as the Xeno AI is no
longer existant.

- Re-map the Ninja outpost.

- Add security newscaster to the HoS's office.
2015-01-19 15:16:09 -05:00
Markolie
16f5233efc Fix Ninja Kamikazi mode exploit 2015-01-19 20:25:22 +01:00
Markolie
4312930a09 Fourth grab crushing re-added 2015-01-19 18:38:09 +01:00
Markolie
2cd437ee5f Fix window crushing 2015-01-19 18:35:45 +01:00
Markolie
2dfdd7243c Disable hardsuit breaches, re-add engi shuttle 2015-01-19 18:18:58 +01:00
Fox-McCloud
15a0443bcc Merge pull request #194 from Fox-McCloud/Malf-Hotfix
Hostile Lockdown
2015-01-18 22:41:52 -05:00
Fox-McCloud
7f724ed774 Hostile Lockdown 2015-01-18 22:40:53 -05:00
Fox-McCloud
3c3fdf6ad4 Merge pull request #193 from Fox-McCloud/Science-Station
Science Station
2015-01-18 22:07:42 -05:00
Fox-McCloud
098998ac89 Science Station 2015-01-18 21:43:40 -05:00
DZD
6dbd475166 Fixes Changeling Bug
Fixes the bug where changelings could extract DNA from races with
NO_SCAN if they used the extract DNA sting.
2015-01-18 15:32:14 -05: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
bbdc450104 Atmos fix 2015-01-18 07:31:31 +01:00
Markolie
34a7bc645a Plasma iwndow coloring fix 2015-01-18 04:50:11 +01:00
Markolie
ca74026ad3 ED-209 construction fix 2015-01-18 04:28:16 +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
5713c3f04f Minor Fixes
- Makes mime invisible wall actually invisible.
- Fixes formatting mistake in wizard spellbook.
2015-01-17 12:26:05 -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
DZD
0dd49f9f14 Minor Fix for the Wiz Clothing Restriction Removal
- Remove Clothing Restriction now properly uses 2 spell slots instead of
1.
2015-01-16 20:35:19 -05: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