952d7c9e93
Adds ability to photocopy paper bundles
2014-05-10 19:03:42 +02:00
a68c4e9c55
Fixes #3993
2014-05-10 10:26:05 +09:30
e277349e0e
dynamic description and fixes
2014-05-08 20:15:25 +02:00
488f645f07
Adds the ability to remove the item viewed
2014-05-08 06:47:05 +02:00
435240ce2e
Added ability to put paper bundles into folders and cabinets
2014-05-08 00:56:32 +02:00
8e08231c3a
Adds functionalities for viewing, writing, stamping and adding photos
2014-05-07 22:50:15 +02:00
e620d41f41
Adds basic functionality to paperbundles
2014-05-07 03:54:05 +02:00
0f74b0f3bb
Ability to spawn a paper bundle by hitting paper with paper
2014-05-06 20:26:53 +02:00
76b65f59a9
Targeting eyes with book/paper shows book/paper
...
This is a way to show other players papers without giving them the
paper/book.
2014-05-03 19:56:55 +03:00
e1ddec4a73
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
code/game/area/Space Station 13 areas.dm
code/game/objects/items/weapons/manuals.dm
code/modules/mob/living/say.dm
code/modules/organs/organ_internal.dm
code/modules/paperwork/paper.dm
code/modules/supermatter/supermatter.dm
html/changelog.html
icons/mob/uniform.dmi
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-05-03 16:56:19 +01:00
87d4cf7238
Photocopiers now copy stamped papers, also minor bugfix
2014-04-30 05:46:51 +02:00
0ef558cfa2
Paperbin fix, now doesn't silently fail if it has papers shoved into it.
2014-04-27 08:54:31 -05:00
185f325944
fix for paper bin runtime
2014-04-25 21:42:59 -07:00
4236966e76
fixed what Mloc pointed out.
2014-04-25 13:14:01 -07:00
bbf7b31ccd
Fixes to carbon copy paper. Basically merging it with regular paper bins.
2014-04-25 12:59:50 -07:00
45d82c2e00
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into phoron
...
Conflicts:
code/modules/mob/living/say.dm
maps/tgstation2.dmm
2014-04-16 22:13:48 -07:00
68eda5201b
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into phoron
...
Conflicts:
code/ATMOSPHERICS/components/unary/vent_scrubber.dm
code/modules/paperwork/paper.dm
html/changelog.html
icons/mob/uniform.dmi
maps/tgstation2.dmm
2014-04-16 21:44:26 -07:00
5878cebb85
Fixed typo on Standard Operating Procedure paper
...
Changed alrms to alarms
2014-04-16 02:47:48 -07:00
756d7a83e9
Merge pull request #4715 from Iamgoofball/FUCKMONKEY
...
Removes the last traces of Monkey Emergency
2014-04-11 11:47:37 -07:00
1d6655850f
Changes all appropriate instances of toxins to phoron
2014-04-10 15:11:26 -07:00
a3e4a43536
Changes most viable, used entries of plasma with phoron.
2014-04-10 05:05:04 -07:00
e6c3fbf071
Changes all appropriate instances of 'Plasma' to 'Phoron'
2014-04-10 01:19:49 -07:00
9fb43f2333
Merge pull request #4706 from DJSnapshot/papers
...
Carbonless copy papers
2014-04-07 02:12:10 -05:00
36b2efd3df
disregard failure. I made a silly.
2014-04-06 18:29:50 -07:00
238451dbc9
die monkey emergency DIE
2014-04-06 12:05:41 -07:00
61036e529e
Merge pull request #4692 from Hubblenaut/master
...
Renamed paperwork no longer has 'paper -' in name
2014-04-05 17:03:48 -07:00
4ea07e2617
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into papers
2014-04-05 16:24:56 -07:00
cd23a4b786
Merge pull request #4690 from Glloyd/ear_stuff_2
...
A first pass at more realistic w_class values
2014-04-05 16:23:59 +01:00
0b29f83444
Renamed paperwork no longer has 'paper -' in name
2014-04-04 22:18:08 +02:00
72e45ebf7b
A first pass at more realistic w_class values
2014-04-03 17:54:06 -04:00
ffd4afa43d
Also fixes paperbin without hands
...
Whee.
2014-03-31 18:48:57 +03:00
0affa39490
initial CC paper commit. Will continue work on this.
2014-03-30 16:41:06 -07:00
4340e4a6b5
Talisman icon fix
...
Makes talismans keep looking like talismans for more than a tick.
2014-01-10 17:09:01 -05:00
8b0f778a83
Mass updates to paths for blood decals.
2013-12-26 01:56:06 +10:30
b175c6906b
Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev
...
Conflicts:
html/changelog.html
2013-12-13 19:13:43 +00:00
0208cef65b
EMERGENCY HREF exploit fix.
...
Impressive chaos, but its time is over.
Signed-off-by: Mloc <colmohici@gmail.com >
2013-12-07 21:26:37 +00:00
f6fff10908
Added burning paper with lighters
...
* why not?
* Now with 150% more noir
2013-12-01 17:26:33 -05:00
eb9a337d07
Merge remote-tracking branch 'upstream/master' into dev
2013-10-11 12:44:44 +03:00
464fc22fa5
Missing verb.
2013-10-11 10:18:43 +03:00
65f218ee63
Merge branch 'master' into dev-freeze
...
Conflicts:
code/ZAS/Fire.dm
html/changelog.html
maps/tgstation2.dmm
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-10-08 22:01:16 +01:00
a1f55a50b1
Massive click code rework by SuperSayu, ported from TG.
...
Full details at https://github.com/tgstation/-tg-station/pull/1206
Fixes #3648
Hopefully done right this time.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-10-08 20:27:39 +01:00
1d21cc7e55
Missed a couple 'color to item_color' in stamps.dm
2013-09-29 23:57:08 -04:00
49c0a30301
Merge branch 'master' into dev
...
Conflicts:
baystation12.dme
html/changelog.html
2013-09-26 10:26:03 +01:00
e9bf414820
Refactors code to work with BYOND 500.
...
500 adds a "color" var to /atom, which conflicts with /obj/item/color, /obj/atmospherics/color and various simple_animals.
/obj/item/color is now item_color
/obj/atmospherics/color is now pipe_color
simple_animals color is now body_color
Removes transformer.dm since it conflicted with transform() and was never used.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-09-22 12:39:48 +01:00
35621466e1
Merge conflict fix.
2013-09-14 22:49:11 +03:00
d5f20aa874
Colour fix.
2013-09-13 19:43:59 +03:00
b75d97a488
Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
code/game/machinery/kitchen/gibber.dm
code/modules/mob/living/carbon/human/inventory.dm
code/modules/reagents/reagent_containers/hypospray.dm
maps/tgstation2.dmm
2013-08-31 17:45:31 +01:00
3fbdc99079
Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs.
2013-08-28 03:33:04 +01:00
a229582187
Added IA stamps, IA office has a receiving desk.
2013-08-27 22:10:20 +01:00
e7f38be3b4
Beakers and other glass containers now hide their contents, only showing the amount.
...
Additionally, they can be labeled with a pen, up to a max of 10 characters.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-07-22 17:38:34 +01:00
Hubblenaut