=
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
PsiOmegaDelta
6f1f18c3a7
Merge pull request #8647 from Kelenius/ofStaffsAndChange
...
Of staffs and change
2015-03-30 13:18:51 +02:00
Kelenius
bb2ad4efdb
More change for the staff of change
...
Better item dropping
elseif instead of if
No more create_new_xenomorph
And a span class
Yay for named xenos
2015-03-30 10:11:41 +03:00
=
d2ede0afd4
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev
2015-03-30 08:55:49 +10:30
=
d77010221c
Merge with dev.
2015-03-30 08:36:52 +10:30
PsiOmega
59638b2300
Fixes #8661 .
...
Now ghosts the AI before it's deleted, setting the respawn timer.
2015-03-29 16:53:48 +02: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
23bbbb7e4c
Moves sanitize(message) up a level for now.
2015-03-29 13:51:19 +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
916da8e8a3
Refactors say down to /mob/living/say level.
2015-03-29 12:54:53 +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
GinjaNinja32
e7b4370772
Fixes #8650
2015-03-28 22:01:02 +00: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
47ad072225
Merge branch 'Baystation12/dev' into ofStaffsAndChange
...
Conflicts:
code/modules/projectiles/projectile/change.dm
2015-03-28 19:37:50 +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
accbb02b7f
Fixing bugs.
2015-03-28 11:53:39 +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
3cd206535a
Merge pull request #8639 from mwerezak/holocarp-fix
...
Holopad fix, makes holodeck objects slightly transparent
2015-03-27 20:57:30 +03:00
mwerezak
486940c9e0
Makes holo objs slightly transparent
2015-03-27 10:32:41 -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
PsiOmegaDelta
ce414b2eba
Merge pull request #8637 from mwerezak/holocarp-fix
...
Fixes holocarp not being transparent
2015-03-27 07:07:20 +01:00
mwerezak
872e0a0e84
Fixes holocarp not being transparent.
2015-03-27 01:36:36 -04:00
GinjaNinja32
05f9411910
Fixes webbings utilising bluespace storage for infinite storage (again)
2015-03-27 03:06:29 +00:00
Zuhayr
c0887333bc
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev-freeze
2015-03-27 11:13:53 +10:30
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
dda3fc8f02
Merge pull request #8469 from mwerezak/robot-emp
...
Reduces the effect of EMP on robot power cells, some other things
2015-03-26 19:00:39 +10:30
Zuhayr
7ac1e44628
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into limbs
2015-03-26 17:01:33 +10:30
Zuhayr
ff582ff61e
Readded Pun Pun.
2015-03-26 16:57:45 +10:30
Zuhayr
f9a1bcd2c5
Moved mob blood overlays to the species datum.
2015-03-26 16:38:24 +10:30
Zuhayr
1d26b6c20b
God dammit.
2015-03-26 16:08:51 +10:30
Zuhayr
87f37dbb43
Moves damage masks and damage overlays to species level.
2015-03-26 15:45:47 +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
41d3642813
Changes the silicon is_malf/is_traitor procs to utilize the new antag datums.
2015-03-25 19:27:03 +01:00
PsiOmega
9b7834ff7a
Refactors the AI eye.
...
Relocates eye movement to the eye code itself.
Adds a mask that allows any mob able of wearing it direct access to the camera network, as a proof of concept and adminbus.
2015-03-25 18:53:11 +01:00
Zuhayr
bb2cd41c8c
Fixed up gibbing and organ icons.
2015-03-26 00:40:59 +10:30
Kelenius
bdeb4da5f4
Fixes SoC and xenos
2015-03-25 16:22:11 +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
volas
31360a344b
merge fix
2015-03-25 01:13:23 +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
PsiOmega
bbe5d67e44
Refactors the AI eye.
...
Now possible to customize chunk obfuscation image per chunk type.
Obfuscation images are stored per type (thus the small datum structure) to reduce memory footprint in the case of multiple chunks using the same image.
2015-03-24 22:07:22 +01:00
PsiOmegaDelta
447cbab45f
Merge pull request #8613 from mwerezak/gun-rewrite
...
Adjusts ammo autolathe costs
2015-03-24 21:54:49 +01:00
Chinsky
959ee07119
Merge pull request #8607 from Kelenius/ofDrillsAndMiners
...
Updates drill and scanner
2015-03-24 20:05:25 +03:00
