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
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
Zuhayr
772715f2da
Merged dev-freeze into master. Two map conflicts, used dev-freeze map.
2014-08-27 20:46:04 +09:30
Zuhayr
cf68ad7c87
Master to dev merge.
2014-08-27 20:24:07 +09:30
PsiOmega
0090efb210
Fixes an issue where toggling camera lights would disconnect the AI from an active holopad while keeping the pad online.
2014-08-26 16:38:44 +02:00
Chinsky
7d18ddfab1
Merge pull request #6146 from PsiOmegaDelta/Dylovene
...
Renames anti-toxin bottles to dylovene.
2014-08-24 21:45:00 +04:00
PsiOmega
f19001feb8
Renames anti-toxin bottles to dylovene. Soporific tossed out. Sleep toxin renamed to Soporific.
...
Based on http://baystation12.net/forums/viewtopic.php?p=237269#p237269
2014-08-23 17:22:04 +02:00
PsiOmega
ad387fda96
One can now update crew record photos using a security console.
2014-08-22 19:39:35 +02:00
Chinsky
472e9b764d
Added ability to pick photo size.
2014-08-19 21:19:23 +04:00
Zuhayr
f09d1218fe
Master to dev merge.
2014-08-11 17:23:40 +09:30
Walter0o
2dd71b53a7
adds lipstick wiping to proper paper/attack()
2014-08-03 13:52:59 +02:00
Walter0o
cfdb3288e7
derping derps
...
thanks to @mwerezak
2014-07-31 12:12:30 +02:00
Walter0o
f0042741fc
filing cabinet exploit fix
...
hooray for teleporting atoms to you via magic office furniture
2014-07-31 10:03:22 +02:00
Walter0o
f9de5e3866
refining the clipboard topic checks
2014-07-31 08:57:56 +02:00
Walter0o
596ae37794
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-07-31 05:01:31 +02:00
Walter0o
67e58effd2
folder exploit fixes
2014-07-31 04:08:34 +02:00
Walter0o
404a89aed6
clipboard exploit fixes
2014-07-31 04:01:14 +02:00
PsiOmega
3ad8f4ca24
Merge branch 'dev' into Pics
...
Conflicts:
code/modules/paperwork/photography.dm
2014-07-29 16:45:55 +02:00
PsiOmega
2f8bb7e135
Fixes runtime errors. AIs and cyborgs can now attach their photos to newscasters as well as photocopy them.
2014-07-29 15:45:22 +02:00
PsiOmega
a5f6d417a1
Expands the AI photo-camera so that it now has robot/cyborg support. Also implements DRY in practice.
2014-07-28 23:41:55 +02:00
JimTheCactus
f5df1acaaa
Added handler for pixel stepping
2014-07-28 13:05:29 -06:00
JimTheCactus
6b1f696203
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.)
2014-07-28 12:44:42 -06:00
JimTheCactus
f0594b6e21
Made camera render turf effects.
2014-07-28 12:10:21 -06:00
JimTheCactus
df3fcbc9b2
Ported nearest-neighbor scaling from TG
2014-07-28 11:54:01 -06:00
PsiOmega
63ab44accc
Makes it possible for the AI to take and view images.
2014-07-28 17:30:51 +02:00
JimTheCactus
8e4ac0a807
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-28 01:46:07 -06:00
JimTheCactus
bdbc404d07
Added workaround for non-directional icons with dir!=2
...
Several items in the map are set with a dir other than 2 but the icon associated with the item doesn't have directions. As such they misrender.
This resolves that specific issue, for the most part. Due to an odd behavior of Byond, when this circumstance occurs the icon proc produces a 32x32 image that is all alpha 0. At least that's what my testing suggests; it may be possible with large icons to encounter this as an issue and cause it to ignore an icon that should be reloaded from the default. However, this can't do any worse than the current software.
2014-07-28 01:04:52 -06:00
JimTheCactus
1d7310c49d
Patched display and dealt with lying.
2014-07-27 22:05:24 -06:00
Hubblenaut
c2f1a23e3e
Moves paperbin to OBJ_LAYER - 0.1 to prevent clipping
2014-07-21 12:08:51 +02:00
Chinsky
cc9cf46dbe
Merge pull request #5359 from Baystation12/master
...
master -> dev
2014-06-25 15:37:04 +04:00
Zuhayr
4cc0d6b6ee
Fixes #5339
2014-06-24 11:35:08 +09:30
Zuhayr
136ccc347b
Merge with dev.
2014-06-12 01:14:40 +09:30
Zuhayr
4ee8f56c29
Merged master to dev, manually fixed merge issues in map, may be some left.
2014-06-11 18:11:41 +09:30
