Commit Graph

10065 Commits

Author SHA1 Message Date
Markolie 2a1e9931a6 Add shuttle stranding 2015-02-01 16:05:43 +01:00
Markolie 8fb90212b8 Blob event fixes, toggle preferences age check, jobban check 2015-02-01 14:19:11 +01:00
Fox-McCloud f7c1c8b0e9 Spacesuit Buff 2015-01-31 23:36:56 -05:00
Fox-McCloud c0af6fb3e0 Merge pull request #244 from TheDZD/changeling
Traitor Objective Improvement
2015-01-31 21:11:46 -05:00
Fox-McCloud 0d7c972084 Merge pull request #238 from Markolie/master
Mapfix, dbconfig update, sec camera template network fix, code cleanup, additional jobbans, antag minimum age
2015-01-31 19:54:51 -05:00
Fox-McCloud 6350d57dd8 Merge pull request #243 from ZomgPonies/econ
Default_slot fixes.
2015-01-31 19:10:13 -05:00
ZomgPonies 8049264b1c Default_slot fixes. 2015-01-31 19:07:20 -05:00
Fox-McCloud 1a45e7c9ee Merge pull request #242 from ZomgPonies/econ
Econ Phase 1 Bugfix: Fixes people with random names spawning with no ID
2015-01-31 17:23:18 -05:00
ZomgPonies b5e66de4c3 Econ Phase 1 Bugfix: Fixes people with random names spawning with no ID 2015-01-31 17:15:51 -05:00
Markolie d9cf2a8bbe Simple animals and turrets will now attack pods 2015-01-31 21:25:46 +01:00
Markolie 409dd8cfce Fix some oversights 2015-01-31 19:54:24 +01:00
Markolie c520856716 Additional jobban options, minimum account age for antags 2015-01-31 19:48:48 +01:00
Markolie 56cd293f4b Unused/WorkInProgress folder cleanup 2015-01-31 16:40:29 +01:00
Markolie 4e15c5c1bc Remove jukebox debug 2015-01-31 15:38:16 +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
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 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
Tigercat2000 af6cd76365 New Preference; Slime People Color. This allows slime people
to choose their color in the lobby. MySQL sync to come later.
2015-01-30 01:14:57 +01: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
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 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 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