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 |
|
Chinsky
|
8d83e8d452
|
Merge pull request #9202 from Zuhayr/customitems
Custom items refactor.
|
2015-05-14 21:47:04 +03:00 |
|
Zuhayr
|
1dfade1a33
|
master>dev
|
2015-05-13 17:09:57 +09:30 |
|
Zuhayr
|
a9f936fe42
|
Added exosuit customisation kits to cargo.
|
2015-05-13 11:20:54 +09:30 |
|
Zuhayr
|
eef2f589ce
|
Housekeeping.
|
2015-05-13 10:32:26 +09:30 |
|
Zuhayr
|
4e85c5f387
|
Dev merge.
|
2015-05-12 23:33:29 +09:30 |
|
Chinsky
|
86c8c8c52b
|
Changed similar proc in datacore to just use icons of actual human it gets. Works fine for both latejoin and roundstart.
Also fixed a runtime, somehow head was created without a tajaran and got lost.
|
2015-05-12 06:42:08 +03:00 |
|
Zuhayr
|
4cf296a6c9
|
First pass on custom item cleanup/refactor.
|
2015-05-12 10:53:16 +09:30 |
|
mwerezak
|
56c610e111
|
Updates weed control crate
Removes the scythe from the weed control crate and replaces it with hatchets and plantkiller spray bottles.
|
2015-05-11 21:20:16 -04:00 |
|
PsiOmega
|
27b917ed6c
|
Teleport cleanup.
Teleporter code now uses:
Absolute paths.
Span classes.
Configured Z-levels to determine valid destinations, as opposed to hardcoded.
|
2015-05-05 09:55:19 +02: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
|
fe09ed1a22
|
Merge remote-tracking branch 'upstream/dev' into BorgModules
Conflicts:
code/game/objects/items/robot/robot_upgrades.dm
code/modules/mob/living/silicon/ai/subsystems.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/mob/living/silicon/robot/robot_upgrades.dm
|
2015-04-26 15:52:18 +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 |
|
PsiOmega
|
a6a428af6a
|
Mecha + misc. Destroy() because I had already begun.
|
2015-04-17 09:55:59 +02:00 |
|
PsiOmega
|
d3b000f2cc
|
Ensures Admin Deletes uses qdel.
Ensures that Destroy() is properly called, for types implementing it.
|
2015-04-16 12:56:24 +02:00 |
|
Zuhayr
|
7129feb417
|
Removed some cocked up files.
|
2015-04-13 22:58:32 +09:30 |
|
Zuhayr
|
a029f88cfc
|
Added construction drone variant, updated the construction area map slightly.
|
2015-04-11 19:20:13 +09:30 |
|
Chinsky
|
7b15bd59e5
|
Merge pull request #8768 from Yoshax/emergencymessage
Emergency message changes
|
2015-04-09 08:15:19 +03:00 |
|
PsiOmega
|
66c56926d0
|
Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
code/game/gamemodes/cult/runes.dm
|
2015-04-08 10:40:38 +02:00 |
|
Mustafa Kalash
|
177d968933
|
Changes flour sacks to a condiment, so that players will be able to pour flour straight into beakers, instead of having to use the grinder first.
|
2015-04-06 18:40:11 -04:00 |
|
Yoshax
|
5a34b1481b
|
Big emergency message changes
|
2015-04-06 20:17:18 +01:00 |
|
PsiOmega
|
036a948372
|
Rune logging.
Adds various rune logging.
|
2015-04-06 09:44:56 +02:00 |
|
PsiOmega
|
8e55ad8114
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
code/modules/mob/mob.dm
|
2015-04-03 09:33:05 +02:00 |
|
Mustafa Kalash
|
1a614c12de
|
Switches hacky list copying method in check_items and check_fruit to use Copy(). Uses Cut() to make sure that one item does not satisfy the need for multiple items of the same type.
|
2015-04-01 11:41:46 -04:00 |
|
Kelenius
|
41ff9819bd
|
Merge branch 'dev' into ofChemistryAndStuff
Conflicts:
code/modules/mob/living/carbon/carbon.dm
code/modules/organs/organ_internal.dm
code/modules/organs/organ_objects.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/reagent_containers/syringes.dm
|
2015-03-31 17:44:42 +03:00 |
|
=
|
601e6fb7ef
|
Merged with dev.
|
2015-03-31 11:17:13 +10:30 |
|
Chinsky
|
a8ee3ca25e
|
Merge pull request #8560 from PsiOmegaDelta/PCAILaws
PC AI laws.
|
2015-03-30 21:23:34 +03:00 |
|
Kelenius
|
c3312be968
|
Merge branch 'dev' into ofChemistryAndStuff
Conflicts:
maps/exodus-1.dmm
|
2015-03-30 10:35:37 +03:00 |
|
Zuhayr
|
2f60c4b82d
|
Merge pull request #8638 from Zuhayr/vox
Removes the vox armalis.
|
2015-03-30 08:56:34 +10:30 |
|
=
|
d77010221c
|
Merge with dev.
|
2015-03-30 08:36:52 +10:30 |
|
=
|
6a6e09b15c
|
Updating the organ addition proc.
|
2015-03-30 08:19:30 +10:30 |
|
PsiOmega
|
710abd0921
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
code/modules/spells/mind_transfer.dm
|
2015-03-29 16:23:06 +02:00 |
|
PsiOmegaDelta
|
84e4f6315f
|
Merge pull request #8660 from Baystation12/master
Dev-freeze
|
2015-03-29 16:19:38 +02:00 |
|
PsiOmega
|
5b8f055595
|
Merge remote-tracking branch 'upstream/dev' into PCAILaws
Conflicts:
code/game/objects/items/weapons/AI_modules.dm
|
2015-03-28 20:26:24 +01:00 |
|
Kelenius
|
24ef7752cd
|
Merge branch 'Baystation12/dev' into ofChemistryAndStuff
Conflicts:
code/modules/mob/living/carbon/monkey/life.dm
code/modules/mob/living/carbon/monkey/monkey.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/reagent_containers/glass.dm
|
2015-03-28 19:14:59 +03:00 |
|
Zuhayr
|
0c3a18b0b6
|
Merge pull request #8380 from volas/sanitize_procs
[DNM] sanitize() and text.dm refactoring
|
2015-03-29 00:57:33 +10:30 |
|
mwerezak
|
09fea22231
|
Fixes camera wires
Seems like pulsing was mistakenly set to deactivate the camera during the wire datum update.
|
2015-03-27 23:35:38 -04:00 |
|
Zuhayr
|
8f242740a8
|
Added Techhead's cyberlimbs under datum system. Added limbs to dionaea. Working on robotic limbs.
|
2015-03-28 11:01:11 +10:30 |
|
PsiOmega
|
633db48082
|
Wizard mind transfer attack log.
Adds an attack log for the wizard mind transfer.
|
2015-03-27 09:08:09 +01:00 |
|
Zuhayr
|
c5d42f3a4b
|
More work on severing, improvements to yank-out-object.
|
2015-03-27 17:51:10 +10:30 |
|
Zuhayr
|
59adbae59e
|
Removes the vox armalis.
|
2015-03-27 16:41:32 +10:30 |
|
Zuhayr
|
aa6439096c
|
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into limbs
|
2015-03-26 23:25:26 +10:30 |
|
Zuhayr
|
16b2c9cab8
|
Fixes a minor thing with vox.
|
2015-03-26 15:54:29 +10:30 |
|
PsiOmega
|
41d3642813
|
Changes the silicon is_malf/is_traitor procs to utilize the new antag datums.
|
2015-03-25 19:27:03 +01:00 |
|
Kelenius
|
b4b635f32d
|
Chemistry commit
I messed something in the git
|
2015-03-25 19:09:10 +03:00 |
|
volas
|
5fee41d4ba
|
sanitize() refactor: third pass (misc)
|
2015-03-25 01:05:21 +03:00 |
|
Zuhayr
|
d26800d29c
|
Preliminary work on converting all monkeys to a human subspecies.
|
2015-03-25 02:15:45 +10:30 |
|
Zuhayr
|
b9072baa97
|
Merge with dev.
|
2015-03-24 14:41:07 +10:30 |
|
volas
|
855755f808
|
sanitize() refactor: first pass (sanitize)
|
2015-03-22 23:31:19 +03:00 |
|
PsiOmega
|
e0538df294
|
Changes the silicon is_malf/is_traitor procs to utilize the new antag datums.
|
2015-03-22 17:43:20 +01:00 |
|