Commit Graph

6793 Commits

Author SHA1 Message Date
Zuhayr 0c3a18b0b6 Merge pull request #8380 from volas/sanitize_procs
[DNM] sanitize() and text.dm refactoring
2015-03-29 00:57:33 +10:30
Zuhayr 8f242740a8 Added Techhead's cyberlimbs under datum system. Added limbs to dionaea. Working on robotic limbs. 2015-03-28 11:01:11 +10:30
Zuhayr c5d42f3a4b More work on severing, improvements to yank-out-object. 2015-03-27 17:51:10 +10:30
Zuhayr c0887333bc Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev-freeze 2015-03-27 11:13:53 +10:30
Zuhayr aa6439096c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into limbs 2015-03-26 23:25:26 +10:30
Zuhayr 7ac1e44628 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into limbs 2015-03-26 17:01:33 +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 41d3642813 Changes the silicon is_malf/is_traitor procs to utilize the new antag datums. 2015-03-25 19:27:03 +01:00
Kelenius b4b635f32d Chemistry commit
I messed something in the git
2015-03-25 19:09:10 +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
volas e3d41c3112 Merge remote-tracking branch 'upstream/dev' into sanitize_procs 2015-03-25 01:06:32 +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
mwerezak 1ce81b91b1 Adds bread tube trash item 2015-03-24 04:03:06 -04:00
Zuhayr b9072baa97 Merge with dev. 2015-03-24 14:41:07 +10:30
PsiOmega 2a17d656f2 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-03-23 11:47:15 +01:00
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
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
PsiOmega 470766e301 Moves silicon law logging to a more all-catching location. 2015-03-22 14:11:44 +01:00
Zuhayr bf8ad6d585 Rebalanced xenoflora sprites, fixed numerous issues. 2015-03-22 16:13:15 +10:30
Zuhayr 98da191ac3 Gamemode refactor, lots of code shuffles, PR will have details. 2015-03-21 11:08:17 +10:30
PsiOmega 273bb366f0 AI laws now refer to crew members instead of humans.
Notable exception: Asimov's laws remain true to the original.
2015-03-20 16:20:41 +01:00
PsiOmega 7ab57a4917 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/objects/items/weapons/storage/fancy.dm
	code/modules/mob/living/carbon/human/life.dm
2015-03-20 08:44:52 +01:00
PsiOmega 6e2488ccb0 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/structures/stool_bed_chair_nest/chairs.dm
2015-03-20 08:26:34 +01:00
PsiOmega 3d9d05afce Fixes #8107.
The announcer again has its given name, rather than a randomly selected one.
The announcer now states its business, rather than talks about it.
The announcer now uses the proper frequency.
2015-03-19 21:33:58 +01:00
Chinsky be8e76a01e Merge pull request #8535 from Kelenius/ofCandlesAndTime
Makes candles last longer
2015-03-19 00:20:07 +03:00
Kelenius cc9f15dd67 Makes candles last longer 2015-03-18 20:57:51 +03:00
Mandurrrh 618249131e Gives more/better comfychair color options. Removes unused icons from objects.dmi. 2015-03-18 00:26:42 -04:00
Zuhayr 961272817f Merge pull request #8461 from comma/biofluff
Added support for multiple cloning vats per single console.
2015-03-18 02:55:05 +10:30
Chinsky d2518798ec Merge pull request #8486 from PsiOmegaDelta/NanoLaws
NanoUI - Silicon law manager
2015-03-17 14:24:30 +03:00
Zuhayr e600cdbd3b Fixes #8430 2015-03-17 19:18:30 +10:30
PsiOmega 7f68403ae4 NanoUI - Silicon law manager
NanoUI interface for viewing silicon laws, accessible to both the silicon and admins.
Malf AIs and admins may also add, edit, and remove laws.
2015-03-17 07:22:02 +01:00
GinjaNinja32 458970a617 Merge remote-tracking branch 'upstream/dev' into reagent_dispenser 2015-03-16 21:21:56 +00:00
Techhead0 020e1e4c60 Tweaks.
Regeneralizes sunglasses. Adds plant analyzer and megaphone. Puts EMT gear under general medical.
2015-03-14 15:52:29 -04:00
Techhead0 d4e46182af More things in belts.
I widened the selection of things you can put in various belts. Most
notably, emergency gear in medical belts and botany gear in tool belts.
2015-03-14 14:38:30 -04:00
Chinsky ba18611bb3 Added support for multiple cloning vats per single console.
On spawn, console will attempt to connect to all unconnected cloning vats.
You can change what console connects to which pod with multitool.
2015-03-13 13:21:19 +03:00
PsiOmega ce30b00287 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/setup.dm
	icons/mob/items_righthand.dmi
	maps/exodus-1.dmm
	maps/exodus-5.dmm
2015-03-13 09:23:26 +01:00
Zuhayr e0f23aead5 Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP. 2015-03-11 21:17:51 +10:30
PsiOmega 533ccef0ab Robot code clean up and fixes.
Fixes runtime when a borg is reset.
Fixes issue where /proc/select_active_ai_with_fewest_borgs() would not always return the intended AI.
Fixes issues with new borgs spamming the master AI with creation messages under some circumstances.
2015-03-10 13:37:20 +01:00
mwerezak 9f55526bce Toolboxes can now hold a limited number of w_class 3 items
They can hold up to 3 w_class 3 items, or the usual 7 w_class 2 items.
2015-03-05 11:10:26 -05:00
mwerezak 9aed472531 Minor storage cleanup
Demotes folding to storage/box, makes doughnut boxes a subtype of box.
Removes a couple of istype() hacks from storage.
2015-03-05 11:08:22 -05:00
mwerezak 3bf5a5ca99 Updates storage costs
Storage cost of an item is now twice that of the next smallest item, instead of being equal to the w_class.
Items with w_class 1 or 2 are unaffected. This produces much better behaviour for containers that are limited
by storage space instead of slots, such as how toolboxes are planned to work in a future update.
2015-03-05 10:40:25 -05:00
Chinsky 81a9f87ad7 Merge pull request #8336 from mwerezak/liquidfire
Implements liquid fuel fires
2015-03-03 10:31:49 +03:00
Chinsky ca0f08c30a Merge pull request #8331 from PsiOmegaDelta/PDATrack
The AI now have the ability to track senders of PDA messages.
2015-03-03 10:21:06 +03:00
mwerezak 49b3db964f Implements fuel fires
Implements liquid fuel fires using the liquid fuel cleanable decal objects.
Rewrites zburn to be more sane, replaces convoluted calculations with straightforward reaction limit.
Fixes issue with liquid fuel spreading caused by thee object being deleted.
Prevents zones from being repeatedly added to the active fire zones list, and processed repeatedly.
2015-03-02 12:40:01 -05:00
GinjaNinja32 c3388020ff Reagent dispenser rework 2015-03-02 02:25:32 +00:00