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
Zuhayr
0c3a18b0b6
Merge pull request #8380 from volas/sanitize_procs
...
[DNM] sanitize() and text.dm refactoring
2015-03-29 00:57:33 +10:30
Chinsky
aed4156a77
Merge pull request #8587 from PsiOmegaDelta/EyeRefactoring
...
Refactoring of the AI eye code.
2015-03-27 11:03:15 +03:00
Zuhayr
c0887333bc
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev-freeze
2015-03-27 11:13:53 +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
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
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
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
Zuhayr
d26800d29c
Preliminary work on converting all monkeys to a human subspecies.
2015-03-25 02:15:45 +10:30
Kelenius
78bac425ad
Updates drill and scanner
2015-03-24 18:34:26 +03:00
Zuhayr
0bb2cd835c
Merge pull request #8600 from mwerezak/bread-tube
...
Adds bread tube trash item, merc shuttle vendor
2015-03-25 00:54:16 +10:30
PsiOmegaDelta
89965420bb
Merge pull request #8603 from Baystation12/dev-freeze
...
Dev freeze
2015-03-24 14:00:57 +01:00
mwerezak
1ce81b91b1
Adds bread tube trash item
2015-03-24 04:03:06 -04:00
PsiOmega
1c3c9ca48d
Refactors the AI eye.
...
Generalizes the visual net containing and updating chunks.
2015-03-24 09:00:48 +01:00
mwerezak
113498dc1e
Makes bread tube nutriment content similar to comparable snacks
2015-03-24 03:57:17 -04:00
Zuhayr
7e615521ef
Should fix issues with invisible seeds/products/plants.
2015-03-24 13:51:44 +10:30
Zuhayr
45f28d5372
Fixes #8485
2015-03-24 13:20:24 +10:30
Zuhayr
ef50918b9c
Hackfix for #8588
2015-03-24 12:46:07 +10:30
Zuhayr
a57ba2e26b
Fixes #8589
2015-03-24 12:39:55 +10:30
PsiOmega
bd48c76620
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-03-23 21:14:32 +01:00
PsiOmegaDelta
c85e1ce786
Merge pull request #8592 from comma/maxlen
...
Readded missing check for paper editing
2015-03-23 21:13:43 +01:00
Chinsky
a9ee51bc64
Readded missing check for paper editing
...
Removed it back when HTML in paper was a thing again adn never put back in, can possibly cause issues.
Thanks @volas for noticing.
2015-03-23 23:02:43 +03:00
mwerezak
f8eb5ccb97
indent fix
2015-03-23 13:04:39 -04:00
PsiOmega
35ba4282a6
Refactors the AI eye.
...
Generalizes the chunks used by the eye to decide coverage.
2015-03-23 16:12:13 +01:00
PsiOmega
1db2040daa
Refactors the AI eye.
...
Generalizes the eye itself, allowing it to be created and used by any other mob.
2015-03-23 15:21:39 +01:00
Zuhayr
14950a7e3a
Merge pull request #8584 from Kelenius/ofBorgsAndGlass
...
Fixed construction borg's Rglass
2015-03-23 21:34:36 +10:30
PsiOmega
2a17d656f2
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-03-23 11:47:15 +01:00
PsiOmega
1908ba59e2
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-03-23 11:45:32 +01:00
Kelenius
026ec265d4
Fixed construction borg's Rglass
2015-03-23 12:11:58 +03:00
mwerezak
dc1f05a9da
Tweaks rig emp effect, breach_threshold
2015-03-23 02:49:34 -04:00
mwerezak
ceaa938b89
EMP deals burn instead of brute to silicons, and bypasses robot armour
2015-03-23 02:47:05 -04:00
mwerezak
28df26b36c
Reduces the effect of EMP on robot power cells
...
Temporary fix to resolve #8454
2015-03-23 02:34:17 -04:00
mwerezak
8ff15108f9
Reduces 14.5mm ammo box cost to 2 TC, slight rename
2015-03-23 00:16:48 -04:00
mwerezak
a60921326e
Adjusts ammunition autolathe costs, makes 7.62 mags printable
2015-03-23 00:06:28 -04:00
Zuhayr
1474c6fdd1
Merge pull request #8574 from PsiOmegaDelta/AIDel
...
Deletes AI eye along with the AI.
2015-03-23 10:54:36 +10:30
volas
f8822626bb
sanitize() refactor: second pass(other sanitize functions)
2015-03-23 01:38:09 +03:00
