Commit Graph

206 Commits

Author SHA1 Message Date
ZomgPonies 37fa1108d4 Merge pull request #895 from tigercat2000/okayletstrysomethingslightlydifferent
LINDA
2015-04-30 13:18:48 -04:00
Fox-McCloud ec3bf7d5fd Exploit Fix 2015-04-29 23:15:03 -04:00
Tigercat2000 4f1053f5b7 LINDA, Stage 1
This commit ports the base system of LINDA from TG. This version of linda
is the original version, with none of -tg-'s fixes, rewrites, or other
such improvements attached.

The mob ignite system has been 100% removed, as LINDA does not support
this normally. It may be added back in when the improvements and refactors
to LINDA have been ported.
2015-04-28 08:43:42 -07:00
veganzombeh 85ca01350f Adds a ditigal camera to the protolathe construction menu.
The digital camera allows you to save up to 10 photos, and print or delete them whever you want. It still requires film to print photos.
2015-04-26 10:07:08 +01:00
Sawu d038a0710c Adds spraycans, fixes lipstick, modifies scleaner
This commit does the following:
 - Adds spraycans as a subtype of crayons.
   - Slight crayon overhaul to make room for this
   - Can spray graffiti, runes, and letters on floors & walls
   - Can spray mobs and paint their face

 - Fixes & overhauls lipstick
   - Lipstick is now overlay and Blend() based.
   - Also fixes a few bugs with the system.
   - Updates paper code to accomodate for wiping off spraypaint as well

 - Slight modification to space cleaner
   - Space cleaner now cleans your face of lipstick and spraypaint
2015-04-15 17:19:08 -07:00
Tigercat2000 29c59bd51b Add check for antags in msg_admin_attack
This commit first adds a new helper proc labeled isAntag(), as well as
adding a check for antags for every instance of msg_admin_attack().

Goals of this commit:
 - Make admin ATTACK: logs indicate if attacker is an antagonist.

Note; High probability of merge conflicts, 47 files changed.
2015-04-12 08:41:53 -07:00
ZomgPonies 91e8b909c0 Squish Squash 2015-04-04 14:27:53 -04:00
Cheridan acba4c6cf6 Adds construction permits
Conflicts:
	code/game/gamemodes/objective_items.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/paperwork/photography.dm
	icons/obj/items.dmi
2015-03-26 18:52:29 +01:00
Fox-McCloud abf409149d more tweaks and additions 2015-03-26 09:43:13 -04:00
Markolie abd7e00ab0 Photocopier fix 2015-03-16 18:56:51 +01:00
Markolie cacc2bf917 Fixes 2015-03-16 18:49:47 +01:00
ZomgPonies 9a21ce5fef Merge pull request #529 from Fox-McCloud/Crayons
Crayons and Gloves
2015-03-08 13:24:05 -04:00
Fox-McCloud a3bfa5300b ArtVend 2015-03-07 03:26:45 -05:00
Fox-McCloud 4e4e7ae77f Crayons and Gloves 2015-03-06 21:40:57 -05:00
Fox-McCloud 5cad8fe41e Merge pull request #500 from ZomgPonies/blood
Proper colored blood
2015-03-04 00:24:53 -05:00
ZomgPonies 8a575700b9 Finally got colored blood working properly 2015-03-03 13:45:46 -05:00
Fox-McCloud c1a1f851cf Cyborg Rebalance 2015-03-02 22:54:09 -05:00
Artorp 7843fed4ce Updates paperwork: Armory list 2015-03-02 17:59:22 +01:00
Artorp dbca446d6d Allow paperbins to be picked up from backpacks
Prevents it from being stuck in inventories
2015-02-28 23:09:29 +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
Fox-McCloud 2a1028324c Thickmaterial Flag 2015-02-21 07:26:25 -05:00
ZomgPonies 07cdcb3cff Merge pull request #367 from Markolie/master
Switch copytext and sanitize proc
2015-02-20 16:22:32 -05:00
Markolie 9fedfc7c62 Switch copytext and sanitize proc 2015-02-20 22:17:13 +01:00
ZomgPonies bb1d0c7a71 IC fax & comms console wrong staff 2015-02-20 14:28:39 -05:00
Markolie d8d1670b68 Revert "Revert "Saycode/language/species port from Bay""
This reverts commit d54579850c.

Conflicts:
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/game/objects/items/devices/radio/intercom.dm
	code/modules/mob/living/silicon/pai/pai.dm
2015-02-20 17:46:35 +01:00
DZD 212ca5f5bd MERGE CONFLIIIIIICTS 2015-02-19 20:26:36 -05:00
ZomgPonies d54579850c Revert "Saycode/language/species port from Bay" 2015-02-19 20:15:42 -05:00
DZD d0d6c8eebd Merge with upstream/master
Fixes merge conflicts.
2015-02-19 19:38:48 -05:00
ZomgPonies 043a5e0e31 Merge pull request #331 from Markolie/master
Saycode/language/species port from Bay
2015-02-19 19:07:25 -05:00
Markolie 46c53be6f1 Part 2 of saycode/language/species port from Bay. Also includes bugfixes. 2015-02-20 00:50:28 +01: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
ZomgPonies d3a827f9e8 Move Fax Panel to Event tab since it's IC info 2015-02-17 15:13:07 -05:00
Markolie 0f64c056bd Fax reply fix 2015-02-14 18:48:20 +01:00
Markolie cbc8be2b4f Fax stamp update 2015-02-14 17:20:18 +01:00
Markolie 47e4126277 Add send time to fax, fix nest issue 2015-02-14 04:56:09 +01:00
Markolie 9fed8135d4 Handcuff refactor, IV drip fix 2015-02-14 04:35:32 +01:00
Markolie 61e9fe3b28 Admin fax overhaul 2015-02-13 20:46:19 +01:00
Markolie e7713a4662 Fax UI rework 2015-02-13 15:40:53 +01:00
Markolie f2b09b025f Fix silicon camera 2015-02-13 00:13:52 +01: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 96cb55bab9 Fixes paper that spawns on the map breaking 2015-02-10 01:26:26 +01: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 bee904d99f Paperwork NT Logo Fix
- Fixes the problem where the image for using [logo] in paperwork was
not appearing correctly.
2015-01-13 17:08:55 -05:00
Markolie bb2ce97fd8 Paper bundle ash fix 2015-01-06 02:18:25 +01:00
Markolie 1f54e93239 Burnable photo, burn ash location fix 2015-01-06 02:17:14 +01:00
Markolie 73bf2003c3 Armory mechnical toolbox update 2015-01-06 00:45:02 +01:00
Markolie 4cca604423 Sechud for magistrate, armory inventory paper update 2015-01-06 00:01:20 +01:00