Commit Graph

14973 Commits

Author SHA1 Message Date
Markolie
01f9463bc2 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	maps/cyberiad.dmm
2015-01-31 15:33:08 +01:00
Fox-McCloud
c3b0df0ef4 Merge pull request #241 from Fox-McCloud/Dismemberment-Fixes
Dismemberment Fixes
2015-01-31 03:29:35 -05:00
Fox-McCloud
74bbb57a41 Dismemberment Fixes 2015-01-31 03:14:26 -05:00
Fox-McCloud
516264107e Merge pull request #240 from ZomgPonies/econ
Economy Changes Phase 1
2015-01-31 00:29:36 -05:00
ZomgPonies
ae02ebb446 Economy Changes Phase 1 2015-01-30 23:59:27 -05:00
DZD
fb1271b850 Ports Antag Objectives from TG
- Maroon objective: Prevent person from escaping on the shuttle, this
can include killing them. (Not in rotation)
- Escape with identity objective: Changeling objective, steal a person's
identity and ID, and escape on the shuttle with it. (Not in rotation)
- Exchange objective: 2 traitors are each given documents, one has the
red documents, one has the blue. They must meet and exchange the
documents. However, there is a 20% chance each one of them will have a
backstab objective, where he must escape with both documents. (Should be
in rotation)
- Destroy objective: Kill the station AI. (Not in rotation)
- Adds steal objective to steal the station secret documents, which are
located in the vault filing cabinet. (Should be in rotation)
- Adds special (mostly just used by ninja) objective to steal a
pinpointer. (Should be in rotation)
- Folders and filing cabinets can now store top secret documents.

All associated sprites are ported along with these features from TG.
2015-01-30 23:40:41 -05:00
Fox-McCloud
b5b8c9347f Merge pull request #239 from Fox-McCloud/Internal-Bleeding
Internal bleeding
2015-01-30 21:55:18 -05:00
Fox-McCloud
a4e78be3cc Damage Nerf 2015-01-30 21:44:40 -05:00
DZD
c8ff6547c4 Theft Objective Tweaking 2015-01-30 21:29:39 -05:00
DZD
8dfbe7ed81 Revert "Theft Objective Tweaking"
This reverts commit 1430eb11f1.
2015-01-30 21:26:35 -05:00
DZD
1430eb11f1 Theft Objective Tweaking
- AI stealing objective actually requires an AI inside the intellicard
now.
- RD and xenobiologists no longer get the slime extract objective.
- HoS and Warden can no longer get ablative vest objective.
- HoP can no longer get corgi meat objective.
- CE, RD, Scientists, Engineers, and Life Support Specialists can no
longer get plasma objective.
- Slime extract objective requires that slime extract be unused.
- Renames "nuclear gun" objective to "advanced energy gun" to clear up
some confusion.
2015-01-30 21:26:15 -05:00
Fox-McCloud
3fbc8f9bc8 Merge pull request #237 from ZomgPonies/master
Select Equipment update
2015-01-30 17:40:42 -05:00
ZomgPonies
9d9bdfc0ea Re-adds hawke stuff under generic DS Officer 2015-01-30 17:39:27 -05:00
Fox-McCloud
0d93278247 Merge pull request #207 from FalseIncarnate/master
Botany Plant Additions
2015-01-30 16:35:37 -05:00
FalseIncarnate
5575ca217c Tea and Coffee Fixes
Fixes indentation issues preventing subtypes of coffee from inheriting
the base traits of coffee.

Adds indentation to allow Ice Tea to inherit base traits of Tea, just as
Iced Coffee does for Coffee. (standardization)

Adds Tea to the recognized list of Drinking Glass contents. Now it won't
show as a "Glass of ...What?"
2015-01-30 15:25:26 -05:00
ZomgPonies
f738eda7c7 Select Equipment update/SK
-Removing the Hawke snowflake gear from the select equipment list
-Only -roles- should be added, not your personal gear.
-Fixing up the ID's so they actually show the job on the ID card name
also
-Adding singuloth knights.
2015-01-30 14:01:36 -05:00
Markolie
6a2c1e59fa HUD wording fix 2015-01-30 16:53:36 +01:00
Markolie
895063b095 Pump construction fix 2015-01-30 16:49:50 +01:00
Markolie
5c18855967 Additional sight options for ghosts, makes AI eye visible to ghosts 2015-01-30 16:47:09 +01:00
Markolie
8b10abf46d Syndiborg pinpointer, adds antag preferences and send back to lobby to player panel 2015-01-30 16:24:13 +01:00
Markolie
acda8e7730 Atmos bug fixes 2015-01-30 15:42:55 +01:00
Fox-McCloud
5734a3e991 Merge pull request #235 from Fox-McCloud/Mining-Stuffs
TG Mining Items
2015-01-30 00:40:17 -05:00
Fox-McCloud
2b85b9b777 TG Mining Items 2015-01-30 00:23:53 -05:00
FalseIncarnate
07c3dad77d Botany Reagents/Recipes Revert
Reverts the changes to Reagents and Recipes introduced with the initial
Botany Plant Additions commit.

All ground tea is created equal, as is coffee. Tea Astra and Coffee
Robusta no longer will give special versions of tea and coffee powders
and drinks.
2015-01-29 19:59:37 -05:00
Fox-McCloud
9865c61c7c Skrell Hardsuits 2015-01-29 18:31:15 -05:00
Fox-McCloud
655fdd9106 RIG Helmets 2015-01-29 16:33:51 -05:00
Fox-McCloud
13919cbdc2 Merge pull request #229 from Artorp/ParamedicChanges
Paramedic hazard vest and ambulance spare key
2015-01-29 14:26:24 -05:00
Fox-McCloud
4d17b3b454 Merge pull request #231 from TheDZD/holster
The Return of the Shoulder Holster
2015-01-29 14:25:43 -05:00
Fox-McCloud
f6997d86e6 Merge pull request #230 from Bone-White/master
Better logs for cryokinesis and immolate
2015-01-29 14:15:58 -05:00
DZD
a93ef4dd1b The Return of the Shoulder Holster
- Detective's shoulder holster now only fits projectile-based (not
energy) handguns.
- Swaps the detective's belt holster for the old shoulder holster.
- Makes some specific handguns actually fit inside of holsters.

- Unrelated: Removes a debug output from
/code/modules/power/singularity/generator.dm
2015-01-29 13:23:46 -05:00
Bone White
6d3cde18ed Removing a test var 2015-01-29 16:06:36 +00:00
Bone White
b0d74070d7 Better logs for cryokinesis and immolate
Better admin/attack/server logs for incendiary mitochondria (can only
target self but still needs an admin message) and cryokinesis.

Also adds the caster's name to the visible_message, so everyone knows
who's throwing the ice around.
2015-01-29 15:31:06 +00:00
Artorp
528aabbc7b Fixed spare key in Paramedic
The spare key in Paramedic can now be used on the ambulance.
2015-01-29 09:28:37 +01:00
Artorp
1711eac2ef Added allowed list to paramedic hazard vest
Added missing allowed list to paramedic hazard vest, it can now carry
things such as health analyzers, flashlights, syringers and radios.
2015-01-29 09:14:28 +01:00
Artorp
c281329be0 fix: retractor autolathe build path
Autolathes can now successfully print a retractor.
2015-01-29 08:40:20 +01:00
Artorp
5437a5f274 Body Scanner printing
Added printing functionality to the body scanner
2015-01-29 07:57:43 +01:00
Artorp
d8464d2b7f Chem Master can print the chemical analysis
The Chem Master 3000 can now print out the result of a chemical analysis
to paper.
2015-01-29 05:51:15 +01:00
Fox-McCloud
2d20cdd547 Merge pull request #227 from TheDZD/minor-fixes
Language Fixes
2015-01-28 17:48:38 -05:00
DZD
3f5e70d97e Fixes binary key translating hive channel 2015-01-28 09:37:12 -05:00
DZD
ae1eb6d5ae Language Fixes
- Allows pAIs to hear from inside bags and PDAs (But if you put one
inside a PDA and then in a bag, no hearing. THANKS HORRID NON-RECURSIVE
SAY CODE)
- Allows pAIs to understand carbons speaking in common.
- Allows different caste xenos to understand each other.
2015-01-28 09:14:11 -05:00
Bone White
d022f92a91 Fix for atom/add_hiddenprint()
1) add_hiddenprint was not assigning the list type to fingerprintshidden
on all atoms correctly.  This has now been resolved.

NOTES

This was what was causing the issues with the singularity restart, but I
expect this to also have many other implications.  Some bugs may develop
in live testing, but I believe this will cause far more good than harm,
as all the code expects to find a list.  (fingerprintshidden is always
declared as a list)
2015-01-28 04:54:40 +00:00
Bone White
30109587ed Singularity re-start fixes
1) Fixes an exception which prevented singularity generators from
spawning a singularity if they had fingerprints on them
2) Fixes an exception which was called on machineryprocess on the
deleted singularity generator

NOTES

For some obscure reason, hidden fingerprint logging on machinery does
not create a list if there is only one entry.  I couldn't find why, so I
wrote code to account for either a string or list for the singularity
generator ONLY.
2015-01-28 03:57:39 +00:00
Bone White
28eda34bc0 Adds Injection Only type viruses
Third virus transmission type, only transmits through blood injection.
Contacting infected blood will _NOT_ transmit the disease, only through
getting infected blood into your blood will the disease be transmitted.

Opens up a whole new ballgame for targeted viruses, along with disabled
mutations.  Antagonist and Security-Buffing Virologists unite!
2015-01-27 06:19:05 +00:00
Bone White
e630b0a8cd Virology fixes & mutation disabling
1) Viruses no longer mutate in mobs.
2) Fixed a runtime error with IS_SYNTHETIC check in activate()
3) Antibody Analyzer has a green sprite, to make it easier to
distinguish from the Health Analyzer
2015-01-27 04:38:59 +00:00
Fox-McCloud
b7e4cc0bf6 Merge pull request #222 from TheDZD/minor-fixes
Borer + Respawn as NPC hotfix
2015-01-26 20:01:28 -05:00
DZD
b25e0be33b Borer + Respawn as NPC hotfix
Should prevent people from using Respawn as NPC to enter borers that are
currently in control of carbons.
2015-01-26 20:00:26 -05:00
Fox-McCloud
eaa54e35a7 Vox Hardsuits and Spacesuits 2015-01-26 18:04:22 -05:00
Fox-McCloud
8842df0f88 Merge pull request #219 from Fox-McCloud/Viruses
Virus Nerf
2015-01-26 00:52:02 -05:00
Fox-McCloud
7e834e059d Virus Nerf 2015-01-26 00:38:18 -05:00
Fox-McCloud
44936507d6 Merge pull request #218 from Fox-McCloud/Sound-Hats
Oops, forgot this.
2015-01-24 22:46:11 -05:00