Commit Graph
4623 Commits
Author SHA1 Message Date
DZD 4bcdb94a99 Merge with upstream/master
Fixes conflicts
2015-02-18 13:41:32 -05:00
DZD fbd9c367c0 NODROP flag addition & handling
- Purges canremove
- Implements functionality for NODROP flag, replaces canremove
- Refactors mob inventory unequipping.
2015-02-18 13:22:41 -05:00
Mark van Alphen 87ed05c146 Merge pull request #326 from Artorp/AutolatheQueue
Added queue functionality to the autolathe
2015-02-18 16:16:05 +01:00
ZomgPonies 97f80d0f5b Merge pull request #323 from Fox-McCloud/Sounds
Sounds
2015-02-17 18:44:54 -05:00
Artorp e1eb2b9a1d Updated m_amt and g_amt to match their design 2015-02-17 18:52:31 +01:00
Markolie f5e2d82953 (Plasma decal already fixed) - Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	code/game/machinery/atmoalter/canister.dm
2015-02-17 02:12:22 +01:00
Markolie d7f17f6eba Bug fixes, give roboticist toolbelt, AI recall shuttle option 2015-02-17 01:04:04 +01:00
Markolie 4d8481f83a Merge surgical borgs and crisis borgs 2015-02-16 22:47:55 +01:00
Fox-McCloud a03879d83f Sound Updates 2015-02-16 16:29:43 -05:00
Markolie 8726bad5b0 Z-level check refactor 2015-02-16 20:33:28 +01:00
Markolie ad167dc541 Announcement system overhaul, crew monitor system overhaul, add portable crew monitor 2015-02-16 19:03:29 +01:00
Fox-McCloud 1e4d1df880 Merge remote-tracking branch 'upstream/master' into Cargo 2015-02-14 22:02:39 -05:00
Fox-McCloud 0de7e1035c Cargo Supplies 2015-02-14 21:21:09 -05:00
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
DZD 723dc2ad98 ABSTRACT flag addition & handling
- Adds ABSTRACT flag to relevant items, removes abstract var.
- Adds checks for ABSTRACT where relevant.
- Also removes extra define of golem gas mask.
- Adds NODROP to changeling mutations so I don't have to do that later.
2015-02-12 18:49:26 -05:00
DZD a4cda9287f Merge with upstream/master 2015-02-12 16:43:01 -05: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 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
DZD b3a0c9a975 Removes TABLEPASS and FPRINT flags
- Also adds ABSTRACT and NODROP flags in preparation for removal of
canremove and abstract vars.
- Sorts some of the setup.dm flags so they're in order.
- Replaces 'flags & 2' in policetape.dm with pass_flags & PASSTABLE,
should have the same effect.
2015-02-10 17:41:37 -05: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
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 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
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
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
DZD 6562c9fb83 Merge with upstream 2015-01-24 19:41:24 -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