Zuhayr
23564bda0c
Merge pull request #10694 from PsiOmegaDelta/150817-SynthAccess
...
Synths now relies on access permissions as well.
2015-08-24 17:45:10 +09:30
Zuhayr
edf74e4721
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
code/modules/admin/topic.dm
2015-08-22 02:30:14 +09:30
Zuhayr
3bfa541612
Adds variables for CentComm, NanoTrasen and the station name.
2015-08-22 02:10:11 +09:30
Zuhayr
545e465dfc
Added paper shredders from Minijar.
2015-08-22 02:00:08 +09:30
PsiOmegaDelta
1e7251ded4
Id card handling changes.
...
Equipment now first checks if an id card may be removed, rather than always forcefully doing so.
Station synthetics now have a custom id, rather than re-using the captain's spare, as utilizing robotic storage would otherwise make their id cards available for public use.
2015-08-21 14:04:06 +02:00
Zuhayr
e3d9bc90e3
Added more colour defines, added functionality to the floor painter.
2015-08-18 13:41:04 -07:00
Chinsky
3b500d4076
Merge pull request #10279 from Kearel/LibraryModifications
...
Library modifications
2015-08-13 17:47:16 +03:00
Kearel
93959dc83d
Changelog + scrambled paper
2015-08-13 01:16:00 -05:00
PsiOmega
ba240cb768
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/antagonist/station/rogue_ai.dm
code/game/machinery/atmoalter/portable_atmospherics.dm
code/game/machinery/spaceheater.dm
code/modules/clothing/head/soft_caps.dm
maps/exodus-5.dmm
2015-08-12 21:18:18 +02:00
PsiOmegaDelta
3bba0f95b1
Qdels the photo dummy.
2015-08-12 09:14:36 +02:00
Chinsky
076e7d6788
Merge pull request #10432 from Baystation12/dev-freeze
...
Dev freeze -> Master
2015-08-11 20:13:49 +03:00
PsiOmegaDelta
edce8f73a4
Removes faulty attempt of garbage collecting.
2015-08-11 14:26:32 +02:00
PsiOmegaDelta
adda1d9448
Fixes #9158 .
...
Neither the value True nor False are null. Removes breaking null check
2015-08-11 14:00:13 +02:00
Kearel
ecaf43440b
Paperbin
...
Adds ability to pick up paperbin by dragging it on the player.
2015-07-26 18:58:29 -05:00
PsiOmega
f25e8a7a67
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/stacks/tiles/plasteel.dm
code/game/objects/items/stacks/tiles/tile_types.dm
code/modules/materials/materials.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/silicon/pai/pai.dm
code/modules/surgery/implant.dm
code/setup.dm
2015-06-26 20:28:47 +02:00
PsiOmega
6c891406f9
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/update_icons.dm
code/setup.dm
2015-06-26 19:22:31 +02:00
mwerezak
1b978f9570
Makes update_inv_head() respect item_state and item_icons
...
Fixes #9873
2015-06-26 01:34:15 -04:00
Zuhayr
48cf00ca54
Merge with dev-freeze.
2015-06-21 20:45:47 +09:30
mwerezak
f8d5127078
Adds SLOT_EARS to various items
2015-06-21 01:45:43 -04:00
Mustafa Kalash
bb370a66f3
Merge remote-tracking branch 'upstream/dev' into iaasuit
2015-06-20 14:07:44 -04:00
PsiOmega
0a05c2659f
All the span-corrected dm files.
2015-06-14 22:08:14 +02:00
Mustafa Kalash
cc56480f99
Adds an Internal Affairs hardsuit; adds a mounted pen, stamp, paper dispenser, and flash; maps in the IA hardsuit; and adds a pen which can cycle through the three colors.
2015-06-11 23:31:25 -04:00
PsiOmegaDelta
b44da1ee42
Admin JMP now includes a link to EYE or BDY if any.
2015-06-10 11:08:31 +02:00
PsiOmega
d0232732d4
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/machinery/floodlight.dm
code/game/objects/items/devices/suit_cooling.dm
code/modules/organs/subtypes/diona.dm
code/modules/paperwork/pen.dm
code/modules/reagents/reagent_containers/hypospray.dm
html/changelogs/.all_changelog.yml
2015-05-30 16:11:57 +02:00
GinjaNinja32
76daebe0db
More consistent logging via admin_inject_log proc
2015-05-29 16:57:42 +01:00
GinjaNinja32
86f52910a1
Fixes #5945 , de-copy-pastes parapens and sleepypens
...
Harm-syringes, hyposprays, parapens and sleepypens now all respect armour, and produce admin logs for transferred reagents if any are transferred.
2015-05-28 22:23:37 +01:00
Kelenius
35a20002c6
Merge branch 'dev' into ofResearchAndPrototypes
...
Conflicts:
baystation12.dme
code/defines/obj/weapon.dm
code/game/mecha/equipment/tools/medical_tools.dm
code/game/mecha/equipment/tools/tools.dm
code/game/mecha/mecha.dm
code/game/mecha/mecha_parts.dm
code/game/objects/items/devices/flash.dm
code/game/objects/items/devices/powersink.dm
code/game/objects/items/devices/scanners.dm
code/game/objects/items/stacks/sheets/glass.dm
code/game/objects/items/stacks/sheets/sheet_types.dm
code/game/objects/items/weapons/RCD.dm
code/game/objects/items/weapons/circuitboards/machinery/biogenerator.dm
code/game/objects/items/weapons/circuitboards/machinery/cloning.dm
code/game/objects/items/weapons/circuitboards/machinery/mining_drill.dm
code/game/objects/items/weapons/circuitboards/machinery/pacman.dm
code/game/objects/items/weapons/circuitboards/machinery/power.dm
code/game/objects/items/weapons/circuitboards/machinery/recharge_station.dm
code/game/objects/items/weapons/circuitboards/machinery/research.dm
code/game/objects/items/weapons/circuitboards/machinery/shieldgen.dm
code/game/objects/items/weapons/circuitboards/machinery/telecomms.dm
code/game/objects/items/weapons/circuitboards/machinery/unary_atmos.dm
code/game/objects/items/weapons/flamethrower.dm
code/game/objects/items/weapons/handcuffs.dm
code/game/objects/items/weapons/kitchen.dm
code/game/objects/items/weapons/shields.dm
code/game/objects/items/weapons/storage/backpack.dm
code/game/objects/items/weapons/surgery_tools.dm
code/game/objects/items/weapons/teleportation.dm
code/game/objects/items/weapons/tools.dm
code/modules/assembly/igniter.dm
code/modules/assembly/infrared.dm
code/modules/assembly/mousetrap.dm
code/modules/assembly/proximity.dm
code/modules/assembly/signaler.dm
code/modules/assembly/timer.dm
code/modules/assembly/voice.dm
code/modules/clothing/glasses/glasses.dm
code/modules/hydroponics/trays/tray_tools.dm
code/modules/mining/drilling/scanner.dm
code/modules/mining/mine_items.dm
code/modules/mining/ore.dm
code/modules/mob/living/silicon/robot/analyzer.dm
code/modules/power/rust/circuits_and_design.dm
code/modules/projectiles/ammunition/boxes.dm
code/modules/projectiles/guns/energy/laser.dm
code/modules/projectiles/guns/energy/special.dm
code/modules/projectiles/guns/energy/stun.dm
code/modules/research/circuitprinter.dm
code/modules/research/designs.dm
code/modules/research/destructive_analyzer.dm
code/modules/research/protolathe.dm
code/modules/research/rdconsole.dm
code/modules/research/research.dm
code/modules/research/server.dm
code/modules/research/xenoarchaeology/genetics/reconstitutor.dm
2015-05-20 11:50:28 +03:00
Kelenius
10915eae24
Merge branch 'dev' into ofChemistryAndStuff
...
Conflicts:
code/game/objects/effects/chem/chemsmoke.dm
code/modules/customitems/item_defines.dm
code/modules/projectiles/guns/launcher/syringe_gun.dm
code/modules/reagents/Chemistry-Holder.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
code/modules/reagents/reagent_containers/food/drinks.dm
code/modules/reagents/reagent_containers/pill.dm
maps/exodus-1.dmm
2015-05-15 11:28:05 +03:00
Zuhayr
495952ff5d
Changed steel material name to a define.
2015-05-12 13:08:41 +09:30
Zuhayr
bc50ba5166
Merge resolution.
2015-05-11 11:47:24 +09:30
PsiOmega
1c38be5cfd
Crayons are now children of pens.
2015-05-05 08:41:24 +02:00
Kelenius
873b38e0a5
Merge branch 'dev' into ofChemistryAndStuff
...
Conflicts:
code/game/objects/effects/chem/chemsmoke.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
2015-05-04 22:36:35 +03:00
volas
93d120a24c
merge fix
2015-05-02 11:16:15 +03:00
Kelenius
4500eac948
Merge and removal of a wild file
...
Merge branch 'dev' into ofChemistryAndStuff
Conflicts:
code/modules/reagents/Chemistry-Holder.dm
2015-04-29 14:20:44 +03:00
Zuhayr
cc19bbb604
Merge pull request #8972 from DeeUnderscore/paper-functionality
...
Paper functionality additions
2015-04-29 02:46:21 +09:30
Kelenius
a2cea5c49c
Merge branch 'dev' into ofChemistryAndStuff
...
Conflicts:
code/modules/reagents/Chemistry-Recipes.dm
2015-04-28 19:22:35 +03:00
Kelenius
317abc6b79
Merge branch 'dev' into ofChemistryAndStuff
...
Conflicts:
code/datums/recipe.dm
code/game/machinery/bots/farmbot.dm
code/game/machinery/bots/medbot.dm
code/game/mecha/equipment/tools/tools.dm
code/game/objects/effects/chem/chemsmoke.dm
code/game/objects/effects/effect_system.dm
code/game/objects/items/toys.dm
code/game/objects/items/weapons/extinguisher.dm
code/game/objects/items/weapons/mop.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/organs/organ_internal.dm
code/modules/reagents/Chemistry-Holder.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/Chemistry-Recipes.dm
code/modules/reagents/reagent_containers/food/snacks.dm
code/modules/reagents/reagent_containers/pill.dm
code/modules/reagents/reagent_containers/spray.dm
maps/exodus-1.dmm
2015-04-28 10:49:26 +03:00
PsiOmega
86d2fa5f61
Build fixes.
2015-04-28 09:04:00 +02:00
PsiOmega
f760d44127
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
code/game/objects/items/weapons/candle.dm
code/modules/paperwork/paper.dm
2015-04-28 08:43:31 +02:00
volas
59e17f7a9b
small fix
2015-04-28 00:41:14 +03:00
Daranz
8b792b6361
Merge branch 'dev' into paper-functionality
2015-04-27 12:37:31 -04:00
mwerezak
549270c73c
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color
...
Conflicts:
code/game/machinery/washing_machine.dm
code/modules/mob/living/carbon/human/update_icons.dm
2015-04-26 14:53:01 -04:00
Zuhayr
dbf8e53020
Mass rename of 'metal' to steel, refactor of walls and falsewall mineral construction, refactor of materials and ores.
2015-04-26 12:53:26 +09:30
volas
53a95d8eff
Fixes #8913
2015-04-25 22:43:50 +03:00
PsiOmega
1fea589ad7
Merge remote-tracking branch 'upstream/dev' into TheSummoning
...
Conflicts:
code/game/machinery/cryopod.dm
code/game/objects/items/weapons/clown_items.dm
2015-04-24 17:13:37 +02:00
PsiOmega
1ae0ad6d92
Updates the atom_pool, now datum_pool, to handle any datum object.
...
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
Daranz
12a6797723
Add renaming of things (papers, etc.) in folders
2015-04-23 21:49:56 -04:00
Daranz
1bd25c54e3
Add random access inserting into paper bundles
...
You can now insert papers into paper bundles by clicking on the next page or
previous page link with a sheet of paper in hand.
The bundle window also now correctly updates when the bundle is in a folder.
2015-04-23 21:49:56 -04:00
Daranz
ad51379d86
Make papers in a clipboard renameable without removing
2015-04-23 08:48:52 -04:00
mwerezak
5b037670b3
Removes most instances of item_color
...
Notable exception is for clothing/under, those will have to be removed once item_state override is implemented.
2015-04-22 17:40:27 -04:00
