Commit Graph

2076 Commits

Author SHA1 Message Date
Markolie
ca90eca6f1 Replace surgical drill in syndicate medikit with combat defib 2015-02-09 23:36:54 +01:00
Markolie
354e569f9d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	code/game/machinery/rechargestation.dm
2015-02-09 16:15:00 +01:00
Markolie
7285f39fc1 Defib update, cell path update 2015-02-09 16:12:01 +01:00
Fox-McCloud
857ca4c3bd Merge pull request #265 from Artorp/DisabilityFixes
Disability fixes
2015-02-09 00:23:01 -05:00
Markolie
58323be9ad Typo fixes 2015-02-09 03:31:06 +01:00
Markolie
8fae0f029f Accessory overhaul 2015-02-08 14:29:10 +01:00
Artorp
69f5776aee Disability fixes
- Disabilities properly updated when new player is made

- Fixed epilepsy disability not linked to proper SE block
2015-02-08 14:20:57 +01:00
Fox-McCloud
af78338a99 Nerfborgs 2015-02-08 00:22:13 -05:00
Fox-McCloud
6e6b7deb8c Merge pull request #262 from tigercat2000/master
Locker open-close sound change
2015-02-07 23:43:32 -05:00
Tigercat2000
d92a0d1ef9 Locker sounds update- Instead of an istype() check in closets.dm, it now
uses the variable 'sound' which is present on every subtype of
structure/closet.
2015-02-07 22:43:28 +01:00
Fox-McCloud
94eccfffcc MetaToys 2015-02-06 23:25:13 -05:00
Fox-McCloud
8667786655 Crossbow Rework 2015-02-03 23:35:09 -05:00
Fox-McCloud
fd23cc9861 Out of Time 2015-02-03 01:12:00 -05:00
Markolie
afac549c39 Revert economy changes, quarantine law fix 2015-02-02 20:02:29 +01:00
Fox-McCloud
c0af6fb3e0 Merge pull request #244 from TheDZD/changeling
Traitor Objective Improvement
2015-01-31 21:11:46 -05: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
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
0d93278247 Merge pull request #207 from FalseIncarnate/master
Botany Plant Additions
2015-01-30 16:35:37 -05: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
eaa54e35a7 Vox Hardsuits and Spacesuits 2015-01-26 18:04:22 -05:00
DZD
6562c9fb83 Merge with upstream 2015-01-24 19:41:24 -05:00
Fox-McCloud
6c3224fe75 Fixes and Such 2015-01-24 18:30:40 -05:00
SamCroswell
bb444d9b68 MarkVA's Optimization 2015-01-24 01:38:21 -05:00
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
Fox-McCloud
1a395dce03 Odds and Ends Changes 2015-01-23 21:57:00 -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
Markolie
09321d6c0b Use station_name proc where possible, mapfix 2015-01-21 23:37:05 +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
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
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
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
60e18d0c0e Major map overhaul, remove customs officer/nanotrasen recruiter 2015-01-12 02:23:45 +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