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
Markolie
38e709e4bd
Telescience crystal revert, supervisor access/PDA/headset fixes
2014-12-14 00:46:46 +01:00
Markolie
b8282b7cae
Blueshield/NT Rep/NT Rec updates
2014-12-10 06:09:06 +01:00
Fox-McCloud
fd9d3edffb
Cell Changes and other Stuff
2014-12-05 05:37:55 -05:00
Markolie
a1a80c1a27
Minor fixes
2014-12-04 18:18:01 +01:00
Markolie
cb7676c139
Re-add stamp images, add more holopads
2014-12-03 02:53:26 +01:00
Markolie
b820c1781d
Make sure observers can read photos/paper bundles
2014-11-30 20:14:19 +01:00
Markolie
0bf46a71b1
Map changes, bug fixes
2014-11-30 20:10:34 +01:00
Markolie
bd11c78235
Replace every instance of NanoTrasen with Nanotrasen.
2014-11-29 21:01:29 +01:00
Markolie
b66f3effae
Bug fixes, implements new copying/faxing system from Bay
2014-11-27 21:00:58 +01:00
Fox-McCloud
f77eb5c914
Traitor Gear and Balance
2014-10-28 01:35:03 -04:00
Fox-McCloud
b1b23dcd70
ParaPen Fix
...
Fixes Parapens and removes extra code
2014-10-23 20:11:29 -04:00
Fox-McCloud
8c1f6431e6
Tweaks and Fixes and Major Map Changed
...
More Info will be posted directly, later.
2014-10-13 22:00:07 -04:00
Walter0o
0ac078ad46
derping derps
...
thanks to @mwerezak
2014-08-03 15:07:07 -04:00
Walter0o
6935180aee
filing cabinet exploit fix
...
hooray for teleporting atoms to you via magic office furniture
2014-08-03 15:01:10 -04:00
Walter0o
d92d7fb30a
refining the clipboard topic checks
2014-08-03 14:59:53 -04:00
Walter0o
d9884f054d
paper exploit fixes
...
i think my favourite part of this was
```var/obj/item/i = usr.get_active_hand()
if( ... && usr.get_active_hand() != i))```
2014-08-03 14:59:38 -04:00
Walter0o
fb7d02ee1f
folder exploit fixes
...
Conflicts:
code/modules/paperwork/folders.dm
2014-08-03 14:58:04 -04:00
Walter0o
3cc234cb03
clipboard exploit fixes
2014-08-03 14:57:13 -04:00
PsiOmega
03e7aaba81
Fixes runtime errors. AIs and cyborgs can now attach their photos to newscasters as well as photocopy them.
...
Conflicts:
baystation12.int
code/modules/mob/living/silicon/ai/ai.dm
code/modules/mob/living/silicon/robot/robot.dm
2014-07-31 17:38:14 -04:00
PsiOmega
6cbee92ec8
Expands the AI photo-camera so that it now has robot/cyborg support. Also implements DRY in practice.
...
Conflicts:
code/modules/mob/living/silicon/ai/ai.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/mob/living/silicon/robot/wires.dm
code/modules/mob/transform_procs.dm
code/modules/paperwork/photography.dm
2014-07-31 17:31:23 -04:00
PsiOmega
0e82de2d39
Makes it possible for the AI to take and view images.
...
Conflicts:
baystation12.int
code/modules/mob/living/silicon/ai/ai.dm
code/modules/mob/transform_procs.dm
code/modules/paperwork/photography.dm
2014-07-31 17:25:10 -04:00
JimTheCactus
e83e99f5b0
Added handler for pixel stepping
2014-07-31 17:15:58 -04:00
Hubblenaut
13413635db
Makes photos visible on bundles
...
Conflicts:
code/modules/paperwork/paper_bundle.dm
code/modules/paperwork/photography.dm
icons/obj/bureaucracy.dmi
2014-07-31 17:15:19 -04:00
JimTheCactus
caa1922c20
Ported multi-turf behavior
...
This allows for layering that moves across tiles and enables alternate methods of enumerating the tile list (not used at present.)
Conflicts:
code/modules/paperwork/photography.dm
2014-07-31 17:12:16 -04:00
JimTheCactus
01802cd5aa
Made camera render turf effects.
2014-07-31 17:05:32 -04:00
JimTheCactus
3709e60979
Ported nearest-neighbor scaling from TG
2014-07-31 17:05:18 -04:00
JimTheCactus
03b075ffd7
Modified to check every pixel
...
Checking only a few pixels had the tendancy to turn my charcter's head inside out when I was pointing directions other than south. Worse case is 1024 tests per object in the image. This test should be uncommon and the CPU usage is constrained by other factors.
2014-07-31 17:05:06 -04:00