Commit Graph

19864 Commits

Author SHA1 Message Date
Zuhayr
16b2c9cab8 Fixes a minor thing with vox. 2015-03-26 15:54:29 +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
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
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
Kelenius
b4b635f32d Chemistry commit
I messed something in the git
2015-03-25 19:09:10 +03: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
GinjaNinja32
61a8b8e14c Fixes #8450 2015-03-25 02:17:02 +00:00
Chinsky
870bbd7084 Merge pull request #8599 from PsiOmegaDelta/OperatingDoor
Door logic gathering.
2015-03-25 01:16:34 +03: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
260fb28827 Merge pull request #8575 from PsiOmegaDelta/AINaming
Fixes #8565.
2015-03-25 02:36:35 +10:30
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
f017764e64 More work on adjusting/tweaking/fixing the limb port to make it functional. 2015-03-25 00:59:17 +10:30
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
Zuhayr
3fe4162719 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into limbs 2015-03-25 00:29:59 +10:30
Zuhayr
a63b9b4e73 Beginning to port over new icon update from limbs branch. WIP 2015-03-24 23:48:54 +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
mwerezak
2d3a767489 Allows mult-shuttles to use docking controllers and adds docking to the merc shuttle 2015-03-24 03:55:06 -04:00
PsiOmega
2b198a6d29 Door logic gathering.
Gathers the checks for if an airlock can be closed into the can_close() proc.
2015-03-24 07:22:39 +01:00
Zuhayr
b9072baa97 Merge with dev. 2015-03-24 14:41:07 +10:30
mwerezak
014692269c Greatly simplifies docking initialization 2015-03-23 23:35:35 -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
GinjaNinja32
89bbfbcfad Fixes depowered doors not being able to be closed 2015-03-23 23:25:58 +00:00
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