Commit Graph

9304 Commits

Author SHA1 Message Date
Markolie
540cdf19f3 Space ninja event fix 2015-02-01 16:51:58 +01:00
Markolie
c4f11b6693 Extra jobban checks 2015-02-01 16:38:17 +01:00
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
Markolie
d3d54b53fd Further atmos fixes 2015-02-01 12:09:47 +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
DZD
a48abebc43 Objective Finalization
- Adds destroy AI objective to traitor objective rotation.
- Adds maroon and destroy AI objectives to the traitor panel's "Add
Objectives" button.
2015-01-31 20:49:36 -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
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
DZD
4b31b3270a Secret documents cannot be normal steal objectives 2015-01-31 16:52:03 -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
01f9463bc2 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	maps/cyberiad.dmm
2015-01-31 15:33:08 +01: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
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
0d93278247 Merge pull request #207 from FalseIncarnate/master
Botany Plant Additions
2015-01-30 16:35:37 -05: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
Fox-McCloud
9865c61c7c Skrell Hardsuits 2015-01-29 18:31:15 -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
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
5437a5f274 Body Scanner printing
Added printing functionality to the body scanner
2015-01-29 07:57:43 +01: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
Fox-McCloud
eaa54e35a7 Vox Hardsuits and Spacesuits 2015-01-26 18:04:22 -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
Fox-McCloud
6ee359f52d Oops, forgot this. 2015-01-24 22:39:12 -05:00
Fox-McCloud
4ef4cce391 Merge pull request #216 from Fox-McCloud/Sec-Armor
Security Armor Buff
2015-01-24 21:58:07 -05:00
Fox-McCloud
74f51188d9 Security Armor Buff 2015-01-24 21:53:50 -05:00
DZD
6562c9fb83 Merge with upstream 2015-01-24 19:41:24 -05:00
DZD
5479a71f14 Merge with upstream/master 2015-01-24 18:52:51 -05:00
Fox-McCloud
4eed99a31a Merge pull request #214 from tigercat2000/master
Fixes possible runtime error with dressers
2015-01-24 18:41:40 -05:00
Fox-McCloud
6c3224fe75 Fixes and Such 2015-01-24 18:30:40 -05:00
Tigercat2000
09b926f0bc Modifies Dresser to accurate reflect lack of socks 2015-01-24 23:56:20 +01:00
DZD
73a1d7ba31 Brig Physician Vest
- Adds Brig Physician vest, sprite by TheFlagbearer.
- Makes changes to Brig Physician locker so that it no longer contains
sec gear, now contains one of every kind of medkit, a flash,
pepperspray, a brig physician vest, a doctor's jumpsuit, white shoes,
and a brig physician headset.
2015-01-24 17:21:05 -05:00
SamCroswell
5e08777895 Re-add Fire Stack. Whoops. 2015-01-24 10:53:41 -05:00
SamCroswell
bb444d9b68 MarkVA's Optimization 2015-01-24 01:38:21 -05:00