Commit Graph

2089 Commits

Author SHA1 Message Date
Markolie
165f8118af Add box of zipties, give zipties to nuke ops and Vox raiders 2015-02-14 14:54:32 +01:00
Markolie
9fed8135d4 Handcuff refactor, IV drip fix 2015-02-14 04:35:32 +01:00
Markolie
0b937d5ace Emag refactor 2015-02-13 16:59:20 +01:00
ZomgPonies
d0d000160b And even moar nade logging from adminlog to attacklog 2015-02-12 02:44:28 -05:00
ZomgPonies
6cf4852a60 More nade logging from adminlog to attacklog 2015-02-12 02:41:33 -05:00
ZomgPonies
4d2ccff974 Moved bomb logging from adminlog to attacklog 2015-02-12 02:04:32 -05:00
ZomgPonies
239c996b1c Moved grenade logging from adminlog to attacklog 2015-02-12 01:58:34 -05:00
Fox-McCloud
c78368a3e8 Merge pull request #281 from ZomgPonies/master
[BALANCE][BUGFIX] Singuloth Knight item balance & Small Bugfixes
2015-02-10 21:35:48 -05:00
Fox-McCloud
c2f84b67f0 Merge pull request #279 from Markolie/master
[BUGFIX] Add report_alerts variable to areas, zeroth law fix, cameranet code update
2015-02-10 21:35:30 -05:00
Markolie
64fe9e8600 Remove legacy viewpoint code, move back to Bay's and /tg/'s system 2015-02-10 17:02:27 +01:00
Artorp
e3de04412e Fixes detective polietape 2015-02-10 07:47:58 +01:00
ZomgPonies
39619bdf62 Tuned Singuloth Knight item balance. 2015-02-09 22:41:20 -05:00
Markolie
3a4679bce7 Remove zeroth law with own board 2015-02-10 03:06:43 +01:00
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