Commit Graph

18945 Commits

Author SHA1 Message Date
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
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
Chinsky
43b8a18938 Areas can now set their sound environments. Default is still 2 (room). For now only hallways and asteroid areas have different ones (hallway and stoneroom respectively) 2015-03-23 03:31:22 +03:00
Zuhayr
a454e77444 Merge pull request #8573 from PsiOmegaDelta/StrayCharacter
Fixes stray character.
2015-03-23 10:55:08 +10:30
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
volas
855755f808 sanitize() refactor: first pass (sanitize) 2015-03-22 23:31:19 +03:00
Chinsky
f4dd077d50 Merge pull request #8571 from PsiOmegaDelta/EyeFix
Fixes #8534.
2015-03-22 21:47:17 +03:00
Chinsky
f72d5e10ef Merge pull request #8570 from PsiOmegaDelta/AIForcedShutters
Emergency shutters opened by silicons no longer autoclose.
2015-03-22 21:47:12 +03:00
PsiOmega
c371f24514 Fixes #8565.
Increases the name change limit from 30 seconds to 5 minutes.
2015-03-22 19:34:30 +01:00
PsiOmega
767f4dd537 Deletes AI eye along with the AI. 2015-03-22 18:51:15 +01:00
PsiOmega
9286f10a35 Fixes stray character. 2015-03-22 18:45:03 +01:00
volas
a5cfca1ee8 Merge remote-tracking branch 'upstream/dev' into sanitize_procs
Conflicts:
	code/__HELPERS/text.dm
2015-03-22 20:37:17 +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
PsiOmega
59ec34e410 Merge remote-tracking branch 'upstream/dev' into PCAILaws 2015-03-22 17:26:09 +01:00