cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changelog, mommi fixes.

Browse Source
This commit is contained in:
Rob Nelson
2014-05-24 18:16:27 -07:00
parent 2b9ca47c9b
commit 9fc56a89c0
4 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/machinery/autolathe.dm
View File

@@ -202,7 +202,7 @@ var/global/list/autolathe_recipes_hidden = list( \
return 1
else
var/mob/living/silicon/robot/mommi/M = user
if(M.is_in_modules(O))
if(M.is_in_modules(O,permit_sheets=1))
user << "\red You can't put something built into you in [src]."
return 1
if (src.m_amount + O.m_amt > max_m_amount)

4
code/modules/mob/living/silicon/mommi/inventory.dm
View File

@@ -5,14 +5,14 @@
/mob/living/silicon/robot/mommi/get_active_hand()
return module_active
/mob/living/silicon/robot/mommi/proc/is_in_modules(obj/item/W)
/mob/living/silicon/robot/mommi/proc/is_in_modules(obj/item/W, var/permit_sheets=0)
if(istype(W, src.module.emag.type))
return src.module.emag
// Exact matching for stacks (so we can load machines)
if(istype(W, /obj/item/stack/sheet))
for(var/obj/item/stack/sheet/S in src.module.modules)
if(S.type==W.type)
return S
return permit_sheets ? 0 : S
else
return locate(W) in src.module.modules

2
code/modules/research/destructive_analyzer.dm
View File

@@ -86,7 +86,7 @@ Note: Must be placed within 3 tiles of the R&D Console
if(isrobot(user)) //Don't put your module items in there!
if(isMoMMI(user))
var/mob/living/silicon/robot/mommi/mommi = user
if(mommi.is_in_modules(O))
if(mommi.is_in_modules(O,permit_sheets=1))
user << "\red You cannot insert something that is part of you."
return
else

8
html/changelog.html
View File

@@ -75,6 +75,14 @@
<!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
<!-- Suggestion: Group changes not merged into master into a single [IN DEVELOPMENT] block, then change the date to today before merging. Makes the changes from the last release a bit easier to comprehend. -->
<div class="commit sansserif">
<h2 class="date">2014.05.24</h2>
<h3 class="author">N3X15 updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">Vox Heist objective fixes and tweaks.</li>
<li class="tweak">MoMMIs can insert metal and glass into autolathes and circuit imprinters.</li>
</ul>
</div>
<div class="commit sansserif">
<h2 class="date">2014.05.22</h2>
<h3 class="author">Kokuten updated:</h3>