Commit Graph

697 Commits

Author SHA1 Message Date
Chinsky a9ee51bc64 Readded missing check for paper editing
Removed it back when HTML in paper was a thing again adn never put back in, can possibly cause issues.
Thanks @volas for noticing.
2015-03-23 23:02:43 +03:00
volas f8822626bb sanitize() refactor: second pass(other sanitize functions) 2015-03-23 01:38:09 +03:00
volas 855755f808 sanitize() refactor: first pass (sanitize) 2015-03-22 23:31:19 +03:00
Zuhayr e0f23aead5 Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP. 2015-03-11 21:17:51 +10:30
mwerezak e840ba2d25 Fixes photocopier runtime 2015-03-09 12:12:31 -04:00
mwerezak 17780e196a Fixes medical record cabinet runtime 2015-03-09 03:18:38 -04:00
PsiOmega bdce7a8e41 Fixes #8322.
When copying a photo new instances are created of relevant icons, instead of referencing them.
2015-03-01 15:21:15 +01:00
Zuhayr 3fc9c0aec7 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro 2015-02-15 22:03:17 +10:30
PsiOmega fde03b2e94 Containers now properly checks types instead of string paths.
Security and medical belts could contain now no longer existing objects. These types have been removed.

Conflicts:
	code/game/objects/items/weapons/storage/belt.dm
	code/game/objects/structures/inflatable.dm
	code/modules/clothing/under/ties.dm
2015-02-14 14:16:40 +01:00
Zuhayr 5e87b21d44 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro 2015-02-14 09:32:17 +10:30
PsiOmega 02dc9e3008 Lightly boosts the clerical kit.
Adds destination tagger, wrapping paper, hand labeler, and the ability to select pen color.
2015-02-10 20:12:32 +01:00
Zuhayr 3b60a5959e Added labelling for hydro trays. 2015-02-04 10:54:18 +10:30
volas ea8e848463 copytext() check for some input 2015-02-01 23:16:04 +03:00
volas 8abd7d0735 correction of all copytext(sanitize(..)) to sanitize(copytext(..)) 2015-02-01 22:54:56 +03:00
Chinsky b995c856a9 Merge pull request #7924 from Kelenius/ofTablesAndPass
Removes FPRINT and TABLEPASS flags
2015-01-30 16:17:41 +03:00
PsiOmega fa931ae9a9 Photo cache improvements.
According to http://www.byond.com/docs/ref/info.html#/proc/browse_rsc browse_rsc() does not resend already cached data, however there is likely also a check to ensure that this data is up to date (using checksums or otherwise) or clients would only ever see the first photo they viewed in a given round.
This small change attempts to ensure that a given photo only has to be downloaded once by appending the photo id to the file name, reducing the risk of #7966 happening.
2015-01-30 10:37:42 +01:00
Loganbacca 34d44f8732 Tape fixes
- Fixed taping paper bundles
- Reduced issues with sticking papers around corners
- Removed a couple of colons from paper_bundle.dm
2015-01-26 15:16:27 +13:00
Kelenius 10de826ca3 Removes FPRINT and TABLEPASS flags 2015-01-23 22:27:32 +03:00
Loganbacca 5fc035bffc Ghost labeller fix
No you cant stick labels on ghosts
2015-01-15 21:21:13 +13:00
Ravensdale 759373ac0a Fixes runtime with hand labelers 2015-01-13 09:52:14 -08:00
PsiOmega 2e34cb79a5 Morphic Clerical Kit
Buy the morphic chameleon stamp (or Stmap) now and get a new pen which fakes signatures for free.
Attempts to improve the value of said chameleon stamp as it feels rather expensive for what it do.
2014-12-12 10:07:42 +01:00
PsiOmega 087cc1882c Fixes #7366.
Kills unecessary photo datum which wasn't even used correctly anymore.
Photos have a global id for ease of synth syncing.
Changes how law/photo syncing is handled when pulsing the appropriate borg wire.
Also ensures re-synced borgs are added/removed from the appropriate AIs.
2014-12-10 21:54:57 +01:00
Loganbacca 224b2f3899 Duct Tape
First pass for adding duct tape.
It can stick paper to things.
It can patch up walls (crudely).
Coder sprites!
2014-12-02 23:17:45 +13:00
PsiOmega 0f8156e77e Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/game/objects/structures.dm
	code/game/objects/structures/inflatable.dm
2014-11-29 10:09:03 +01:00
mwerezak ff8b57b8c0 Fixes #7144 2014-11-27 23:31:40 -05:00
Amunak 245a4f142d Whitespace changed by saving in DreamMaker 2014-11-26 16:24:51 +01:00
Amunak a104c199a7 Renaming paper to its original value will now revert it to initial, not just 'paper' 2014-11-26 16:24:10 +01:00
Amunak bfe738cf8d Ghosts can view paper from anywhere, improved the 'far' message 2014-11-26 16:21:38 +01:00
Amunak 319e3abd27 Papers will now have a nice description like every other item 2014-11-26 16:20:32 +01:00
PsiOmega 2a796f2ddd Merge remote-tracking branch 'upstream/master' into dev 2014-11-21 10:27:56 +01:00
mwerezak 348c9d19f7 Merge remote-tracking branch 'upstream/dev' into faxmachine
Conflicts:
	code/WorkInProgress/kilakk/fax.dm
	code/modules/paperwork/faxmachine.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/paper_bundle.dm
	code/modules/paperwork/photocopier.dm
	maps/tgstation2.dmm
2014-11-20 14:57:35 -05:00
mwerezak 8a975fec06 Removes interdepartment fax cooldown 2014-11-20 14:36:05 -05:00
MagmaRam 587f29e5d3 Fixes paper bundles burning strangely with a match and burning one paper at a time, leaving a lone paperclip at the end that would eat any paper added to it and never let that paper be interacted with. Paper bundles now burn the same way (whole thing at once) no matter what you're burning it with, rather than only burning that way with a lighter. 2014-11-20 05:08:38 -05:00
Zuhayr 90d65aed57 Removed attack_paw, attack_animal and attack_slime. 2014-11-13 17:15:29 +10:30
Zuhayr b4ea25d064 Merge conflict resolution. 2014-11-10 13:00:06 +10:30
mwerezak 3d7636728c Fixes #6941 2014-11-06 19:34:14 -05:00
PsiOmega 77c52f48a8 Newscaster and photo cleanup
Synthetics can no longer magically print color images on a black-and-white photocopier.
No longer possible for organics to acquire a synth-image by un-attaching it from a newscaster.
News articles now come with a timestamp and photo captions, if anything was penned on an attached photo.
Reception-checks no longer unconditionally sleeps the thread. Was causing havoc with NanoUI.

Misc. code refactoring.
2014-11-06 13:28:17 +01:00
PsiOmega bc438e21ad All the relevant examine changes. 2014-11-05 12:44:23 +01:00
mwerezak d38787697a Implements sending faxes to admins 2014-10-31 00:27:00 -04:00
mwerezak e53bd0e237 Merge remote-tracking branch 'upstream/dev' into faxmachine 2014-10-15 21:12:21 -04:00
mwerezak b0cdcc9796 Adds photocopier based faxmachine, removes redundant photocopier vars 2014-10-15 21:07:57 -04:00
Zuhayr 92c92753fb Manual icon file merge. 2014-10-11 06:40:36 +10:30
PsiOmega 3560531d58 Silicons attempting to delete camera images no longer causes runtime errors 2014-10-09 08:21:07 +02:00
Zuhayr df038c9fe8 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-10-06 20:15:59 +10:30
Gamerofthegame a47ec82103 Merge repair 2014-10-03 16:04:31 -04:00
Mloc 58953a3d31 fixes #6499
Signed-off-by: Mloc <colmohici@gmail.com>
2014-10-01 17:48:21 +01:00
Zuhayr 1eb759447e Merge resolution, using dev-freeze map due to unreconcilable conflicts. 2014-09-13 16:54:48 +09:30
Mloc-Argent 712e209ab6 Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/__HELPERS/text.dm
	code/game/machinery/podmen.dm
	code/game/machinery/vending.dm
	code/game/objects/items/candle.dm
	code/game/objects/items/devices/PDA/cart.dm
	code/modules/clothing/suits/jobs.dm
2014-09-10 22:14:37 +01:00
D Anzorge 9d76b55eb7 Add headings to pencode
Allows for h1 through h3 use in pen-written text.
2014-08-31 09:46:45 -04:00
Whitellama f5c9586153 Fixed matches and candles not being able to burn papers. Also made Diona join prompt appear for a bit longer. 2014-08-31 02:12:04 -07:00