Commit Graph

11 Commits

Author SHA1 Message Date
D3athrow
01d2471fc9 Merge branch 'color_replace_2_electric_boogaloo' into Bleeding-Edge
Conflicts:
	code/ATMOSPHERICS/pipe/pipe_dispenser.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/machinery/embedded_controller/embedded_controller_base.dm
	code/modules/mining/money_bag.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/silicon/mommi/mommi.dm
	code/modules/mob/living/simple_animal/friendly/farm_animals.dm
	code/modules/research/destructive_analyzer.dm
	code/modules/research/rdconsole.dm
	code/modules/research/xenoarchaeology/machinery/analysis_base.dm
	code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm
	code/modules/research/xenoarchaeology/tools/ano_device_battery.dm
2015-04-12 16:40:59 -05:00
ComicIronic
d0e9eedd25 drop_item and click code.
drop_item now has a first arg, which is the item to drop.
Hand processing now uses drop_item properly, which fixes #3874, #3796.
Also fixes #3486.
2015-04-12 00:56:43 +01:00
Kurfursten
31ec1256cb This adds sounds to faxes to CentComm and Prayer. Different sounds. Also
it halves the fax time, because 3 minutes is just too long.
2015-04-08 12:49:36 -05:00
ComicIronic
34bab36581 Changes to drop_item.
The drop_item arg is now the loc placed, not the child of the loc or whatever.
Removed a few lines of items being placed into themselves, on themselves, into other things manually, into their users, etc.
Cleans up the fix for MoMMI recharger silliness.

This took about 2 hours of non-stop manual searches.
2015-03-08 21:37:34 +00:00
D3athrow
abf4b7f4d2 Fix admins not being able to reply to fax machines 2015-02-17 21:55:35 -06:00
eswordthecat
13953f9525 Properly remove fax to machine list (default remove on unoverriden proc). 2015-01-22 12:39:36 +08:00
ComicIronic
29a039c03a Code rework of placing things on walls.
Stuff goes under types.
Types have procs.
Never have 500 lines of repeated code again.

I came very close to crying while editing this. You should appreciate that.
2014-12-27 00:06:38 +00:00
Chris
2605ee4870 Fix faxed stuff not having the picture attached when sent to centcom. 2014-10-28 13:26:51 -05:00
Cutelilduck
40a4df1bdd IAA demotions and commendations v2
Fuck you salvage captain.

inb4 this build gets fucked again by this blend stuff that won't
compile. Compiled on a working previous bleeding edge build and it
worked.

Fixed the poster.len thing.

Did not fix the findtext string stuff, doing text2num would further
confuse things and would require more conversion to text to work.
2014-02-25 15:29:17 -06:00
Rob Nelson
05a3b741bd Fix ghosts fucking with Fax machines. (Redmine #50) 2014-01-30 20:28:55 -08:00
Rob Nelson
df4962d00f Added fax machine to IAA office, conference room, and captain's room. 2013-11-03 22:48:18 -08:00