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
mwerezak
398459c2e7
Merge remote-tracking branch 'upstream/dev' into inventoryfix
...
Conflicts:
code/modules/organs/organ_external.dm
2015-03-31 02:13:22 -04:00
Chinsky
65f61122b5
Merge pull request #8604 from Zuhayr/limbs
...
Limb objects, severing and cybernetics
2015-03-31 08:38:54 +03:00
mwerezak
9b2f5cea33
Merge remote-tracking branch 'upstream/dev' into inventoryfix
...
Conflicts:
code/game/gamemodes/revolution/rp-revolution.dm
code/game/machinery/kitchen/juicer.dm
code/game/objects/items/stacks/stack.dm
code/game/objects/items/weapons/cigs_lighters.dm
code/game/objects/structures/stool_bed_chair_nest/stools.dm
code/modules/destilery/main.dm
code/modules/hydroponics/biogenerator.dm
code/modules/mob/living/carbon/human/inventory.dm
code/modules/mob/living/carbon/monkey/inventory.dm
code/modules/projectiles/guns/launcher/pneumatic.dm
2015-03-31 01:37:55 -04:00
Zuhayr
6ac0791a0e
Merge pull request #8654 from PsiOmegaDelta/NullRefAccess
...
Fixes occasional issue with req_(one_)access being null.
2015-03-31 15:50:52 +10:30
mwerezak
9ad533a094
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/living/carbon/monkey/update_icons.dm
code/modules/mob/mob_helpers.dm
code/modules/spells/spellbook.dm
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
2015-03-31 00:16:56 -04:00
Zuhayr
3472513cf9
Merge pull request #8645 from mwerezak/gun-icons
...
Adds Skowron's inhand icons for various guns
2015-03-31 14:12:03 +10:30
mwerezak
cdfce64ad0
Replaces uses of u_equip() with remove_from_mob() or drop_from_inventory(), where appropriate.
2015-03-30 22:05:00 -04:00
=
2e728cfd4b
Added macros for droplimb flags.
2015-03-31 11:42:45 +10:30
=
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
PsiOmega
ef8b7466ac
Merge remote-tracking branch 'upstream/dev' into NarsiePort
...
Conflicts:
code/modules/projectiles/projectile/change.dm
2015-03-30 20:17:05 +02:00
Chinsky
056c00fc9a
Merge pull request #8671 from Yoshax/spellfixes
...
Updates spellbook descriptions and cooldowns
2015-03-30 21:15:08 +03:00
mwerezak
1b4e13aabc
Removes unnecessary and cruft procs from mob/inventory.dm
2015-03-30 05:28:09 -04:00
Kelenius
c3312be968
Merge branch 'dev' into ofChemistryAndStuff
...
Conflicts:
maps/exodus-1.dmm
2015-03-30 10:35:37 +03:00
Yosh
c1b7ca3b89
Further description fixes
2015-03-30 01:17:57 +01:00
Yosh
e9125474dd
Spellbook spell description update
...
Updates what obvious problems in the descriptions I could see.
2015-03-30 01:12:23 +01:00
Yosh
57a8822c43
Spellbook cooldown corrections
...
Displayed cooldowns in the wizard's spellbook were partially incorrect,
fixed now to display the correct cooldowns.
2015-03-30 01:01:12 +01:00
=
d77010221c
Merge with dev.
2015-03-30 08:36:52 +10:30
Yosh
42cb430f02
Changes ED-209 Construction to work with new armor vests
...
Changes ED-209 construction to accept any type of the newer armor vests
rather than the old mostly deprecated armor vests.
2015-03-29 18:05:07 +01:00
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
PsiOmega
1a000b0e0f
Merge remote-tracking branch 'upstream/dev' into NarsiePort
...
Conflicts:
code/modules/mob/living/carbon/human/say.dm
2015-03-29 13:04:53 +02:00
PsiOmega
486c30d34e
Fixes occasional issue with req_(one_)access being null.
...
Refactors the code a bit as well.
2015-03-29 12:46:43 +02:00
PsiOmega
464d702d4b
Mob refactoring.
...
Updates Bump() code.
Intents now use constants.
Simple animals can now use languages without overriding say().
There is now a difference between being able to smash normal and reinforced walls.
Reworks simple_animal/attackby so that constructs don't need to override it simply to add damage resistance.
2015-03-29 10:44:31 +02:00
mwerezak
c59fac2e16
Adds unloaded item state for the STS-35.
2015-03-29 02:40:57 -04:00
mwerezak
ba9b8756da
Allows items to specify which icon files are used for specific slots, moves gun icons to a separate file
2015-03-29 01:52:26 -04: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
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
Chinsky
c322481d36
Merge pull request #8625 from Dennok/patch-7
...
Add CONNECT_TYPE_HE
2015-03-27 20:57:38 +03:00
mwerezak
fb53dd7402
Fixes holopad not checking other holograms being projected from the same projector, if the first one was in range.
...
Simplifies holopad power usage.
2015-03-27 10:31:44 -04:00
Chinsky
aed4156a77
Merge pull request #8587 from PsiOmegaDelta/EyeRefactoring
...
Refactoring of the AI eye code.
2015-03-27 11:03:15 +03:00
Zuhayr
c5d42f3a4b
More work on severing, improvements to yank-out-object.
2015-03-27 17:51:10 +10:30
Zuhayr
c0887333bc
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev-freeze
2015-03-27 11:13:53 +10:30
Den
beed47db2c
Add CONNECT_TYPE_HE construction.dm
...
Add CONNECT_TYPE_HE to heat_exchanging pipes
2015-03-26 16:19:34 +02:00
Zuhayr
aa6439096c
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into limbs
2015-03-26 23:25:26 +10:30
Zuhayr
139edb4f9b
Fixed up some boilerplate.
2015-03-26 23:24:56 +10:30
Zuhayr
7ac1e44628
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into limbs
2015-03-26 17:01:33 +10:30
Zuhayr
efa6f0d3c9
Finalized monkey species definitions and icons.
2015-03-26 14:45:41 +10:30
Zuhayr
ba648e3e8d
Updated ismonkey(), refactored kitchen spike, refactored plastic flaps.
2015-03-26 12:45:12 +10:30
Zuhayr
8af1a818e9
Merge branch 'monkeys' of https://github.com/Zuhayr/Baystation12 into monkeys
2015-03-26 12:18:14 +10:30
PsiOmega
b39a486e61
Fixes duplicate uplink reference.
...
This is the second time I have to fix it for the rifle. Stop breaking it.
2015-03-25 23:14:02 +01:00
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
Zuhayr
9c92d3851a
Got various kinds of limb loss plus dislocation working.
2015-03-25 23:11:00 +10:30
Zuhayr
97112c8a4c
Replaced display_name with name, worked on severing limbs and damage propagation.
2015-03-25 19:07:22 +10:30
Chinsky
870bbd7084
Merge pull request #8599 from PsiOmegaDelta/OperatingDoor
...
Door logic gathering.
2015-03-25 01:16:34 +03:00
volas
e3d41c3112
Merge remote-tracking branch 'upstream/dev' into sanitize_procs
2015-03-25 01:06:32 +03:00
volas
5fee41d4ba
sanitize() refactor: third pass (misc)
2015-03-25 01:05:21 +03:00
