Commit Graph
180 Commits
Author SHA1 Message Date
Markolie 80a560d291 Never mind the ArtVend, mapfix, compile fix, rename plastique --> C4 2015-03-08 19:05:36 +01:00
Markolie b8b0fd13b8 Artvend, merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	code/game/response_team.dm
	maps/cyberiad.dmm
2015-03-08 18:54:13 +01:00
Fox-McCloud 4e4e7ae77f Crayons and Gloves 2015-03-06 21:40:57 -05:00
Markolie 9cbb93777e ERT armory rework 2015-03-04 19:06:22 +01:00
Markolie 4fb7a95cff ERT equipment update 2015-03-04 17:16:19 +01:00
Markolie 4ac1007d82 ERT equipment rework 2015-03-03 22:51:54 +01:00
DZD 69eb5509ec Fixes exchange document objective 2015-03-01 20:35:09 -05:00
ZomgPonies 5a94b87331 Merge pull request #457 from Fox-McCloud/Cameras
Camera Update+Camera Bugs
2015-03-01 12:28:58 -05:00
Fox-McCloud 62462c876f Camera Update+Camera Bugs 2015-02-28 04:01:14 -05:00
Fox-McCloud 923ba5932f RnD Fixes and Tweaks 2015-02-27 17:36:20 -05:00
Markolie bfe8a12f1e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	code/game/objects/items/weapons/kitchen.dm
2015-02-25 20:44:32 +01:00
Markolie 6efa3bcdaa Fix trays (now bags) 2015-02-25 20:42:43 +01:00
SamCroswell c1c6c80eda ERT - Emergency Box, Toolbelt Fix, PDA
The ERT's emergency box now contains:
- A survival knife
- A breath mask
- A full double-extended emergency oxygen tank
- A pair of night vision goggles.
- An inaprov autoinjector.

ERT engineering toolbelts now contain multitools. Whoops.

Add ERT PDAs, at Mark's request.
2015-02-24 13:02:15 -05:00
SamCroswell cd7b1a4075 ERT Rework - Part One 2015-02-24 09:47:44 -05:00
Fox-McCloud 6fba118892 Merge remote-tracking branch 'upstream/master' into Fixes 2015-02-23 16:47:55 -05:00
ZomgPonies e9288c614b Merge pull request #388 from Markolie/master
Remove click delay, standardize mutations, attack animations, attackby() params addition
2015-02-23 12:47:25 -05:00
Fox-McCloud 96a941ba19 Fixes and Guns 2015-02-22 16:32:35 -05:00
Mark van Alphen 130ed7e18c Merge pull request #381 from Artorp/MimeDoor
Gives the mime his very own door and ports /tg/ mime backpack
2015-02-22 22:29:03 +01:00
Markolie 672305e034 Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things 2015-02-22 22:12:11 +01:00
Markolie 72db213067 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	code/game/jobs/job/support.dm
	code/setup.dm
2015-02-22 19:12:11 +01:00
Markolie 982102a407 Standardize mutations 2015-02-22 19:04:43 +01:00
Artorp 62f5006944 Ports mime backpack from /tg/station 2015-02-22 06:27:36 +01:00
Fox-McCloud 2a1028324c Thickmaterial Flag 2015-02-21 07:26:25 -05:00
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
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 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 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
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 58323be9ad Typo fixes 2015-02-09 03:31:06 +01:00
Markolie 8fae0f029f Accessory overhaul 2015-02-08 14:29:10 +01:00
Fox-McCloud 8667786655 Crossbow Rework 2015-02-03 23:35:09 -05:00
Markolie 56cd293f4b Unused/WorkInProgress folder cleanup 2015-01-31 16:40:29 +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 1a395dce03 Odds and Ends Changes 2015-01-23 21:57:00 -05: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 96a89b4591 Bandolier 2015-01-08 21:20:51 -05:00
Fox-McCloud ff2b7cedb2 Clothing Restructuring 2015-01-02 12:40:42 -05:00
Fox-McCloud 43af351d27 Odds and Ends 2015-01-01 21:05:50 -05:00
Markolie 54f1f1c14f First aid kit name fixes 2014-12-24 14:33:00 +01:00
Markolie 2f8be5a6cc Typo fix 2014-12-24 13:56:43 +01:00