Commit Graph

6574 Commits

Author SHA1 Message Date
Laharl Montogmmery
76495953db Moved up Bump() in silicon.dm, and tested it.
According to my tests, unachored AI and Borgs behave as normal when
bumped by a mob.

A human can swap places with a borg if both have help intent on when
moving...
But a borg can't swap places with a human if both have help intent on,
if it's the borg that's moving. Apparently it's a normal behavior,
tested it on Sibyl.

AI don't have intents so they just get pushed.

pAIs aren't affected by bump, as they seem to act like as objects when
walked over or thrown.
Decoys seems to be some old MALF module that isn't in use anymore, so I
didn't touch it.

Conflicts:
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/silicon.dm
2014-01-11 10:45:19 -05:00
LaharlMontogmmery
c9baf8b226 Unanchored AIs can now be pushed and can bump. 2014-01-11 10:42:08 -05:00
Laharl Montogmmery
5160576244 AI can now anchor/unanchor itself.
Add a Toggle Anchor Bolt verb to the AI that allows it to toggle his
'anchored' var and be dragged around. You cannot use the bolt verb in a
locker,disposal, pipe , on a mule or as a card.

Tested Interactions between AI and items :
-While the AI can be dragged, it cannot be pushed. You can however,
while dragging it, move it around on tiles(by clicking on said tile),if
you get stuck.
-Cannot be grabbed or click dropped into the gibber.
-Cannot be grabbed or click dropped into Cryo.
-Cannot be put in the DNA scanner.
-Cannot be put in the morgue, or the incinerator.
-CAN be grabbed or click dropped into a disposals bin, and flushed.
-CAN be put inside a locker. Once there's a locker below and you can
close it, you can drag the AI around - event if it's normally anchored.
If you open the closet while the AI is anchored, the Ai will still be in
a anchored state. Note that it's possible to do this trick without
needing to drag the Ai over a locker, PRIOR to this commit.
-Can drift in space, and  can be mass-driver'd. Also Anchors don't work
in spess.Also Ai goes blind in spess. Honk.
-Can be pulled around on edges in space as normal, slip interaction
works normally.
-Can be telescience'd if unanchored.
-You can get on a mulebot!

Notable problem :
-Ai can be buckled/unbuckled to a chair, and when unbuckled it reverts
to an anchored state.Can be solved by using the verb again. Not a real
issue, but notable.
-Dragging an AI in open space can be a bit of a problem. If you take
sharp turns while jetpacking, the Ai will still drift in the previous
direction. You can stop the AI course by jumping by getting in front of
it. Dead AIs were however able to go through you, but Gia found a fix.

"Doesn't that defeat the purpose of the intellicard?"
No, because you only use the card for 3 cases :

1. In case of Rogue AIs, and it is unlikely it will let you drag it
around.
2. In case od dead AIs, in which case it will still need to be carded in
order to be resurected.
3. In order to steal the AI, and generally they don't like that as well.

So the intellicard will still show uses if this commit gets pulled.

Many thanks to Giacommand for babysitting me and helping me through the
coding and testing stages of this commit. Also, first baby commit, ho!
I've thought of this when Gia decided to change Telescience to not drag
anchored mobs, and realised that this create a lot of fun options for
the AI (rogue or not). Most of the interactions seems to be clear of
bugs, and I didn't get any runtimes when testing (except something about
NanoUI, but Gia and me assumed it was unrelated.)
2014-01-11 10:41:24 -05:00
ZomgPonies
2494bfb177 Doubled the shot capacity of the taser 2014-01-11 07:30:35 -05:00
d3athrow
c8bc025cc7 Fix holywater hurting full power vampires 2014-01-11 04:41:32 -05:00
fleure
f62de1ca2e Added spider butchery
Conflicts:
	code/modules/mob/living/simple_animal/simple_animal.dm
	icons/mob/animal.dmi
2014-01-11 00:21:42 -05:00
fleure
27c35cfdac Added spider meat recipes
Conflicts:
	code/modules/food/recipes_microwave.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
	icons/obj/food.dmi
2014-01-11 00:16:12 -05:00
Furlucis
9dedba21cf Talisman icon fix
Makes talismans keep looking like talismans for more than a tick.
2014-01-11 00:04:09 -05:00
Zuhayr
600bfba275 Colour fix for bread slices. 2014-01-11 00:02:07 -05:00
Zuhayr
2f0cb6635b Icon fixes, shards hidden in food will now lacerate random body parts because damage code is weird. Stop eating chocolate cake sandwich with your left food. 2014-01-11 00:01:34 -05:00
Zuhayr
2cd1580acd Added filling_color var to food items for use in sandwiches.
Conflicts:
	code/modules/reagents/reagent_containers/food/snacks.dm
	code/modules/reagents/reagent_containers/food/snacks/grown.dm
2014-01-10 23:56:24 -05:00
ZomgPonies
1bbc25d52e Fixes 2014-01-10 23:45:20 -05:00
SkyMarshal
a97f985200 Adds developer-level access to ZAS settings.
Fixes bug which would always let heat move through doors.

Conflicts:
	code/modules/admin/admin_verbs.dm
2014-01-10 23:41:43 -05:00
ZomgPonies
43ea65341c Fixes to giant spider abilities 2014-01-10 03:21:20 -05:00
ZomgPonies
4a6601eef1 Merge pull request #113 from SamCroswell/master
Major Ninja Patch
2014-01-09 19:31:38 -08:00
Zuhayr
70d16798b5 Fixed some issues with the diona holder item, generalized it out a little. You can now deconstruct dionaea and probably put them into the washing machine.
Conflicts:
	code/modules/mob/living/carbon/monkey/diona.dm
2014-01-09 21:22:51 -05:00
Zuhayr
e1203f9320 Added resist check for holder items. Also hopefully prevented dionaea icons from remaining on a human mob.
Conflicts:
	code/modules/mob/living/carbon/monkey/diona.dm
2014-01-09 21:13:31 -05:00
SkyMarshal
b5906bba39 Tradeband and Gutterspeak now have a different font than Tradeband.
Fixes #4143

Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/new_player/new_player.dm
2014-01-09 21:05:36 -05:00
SkyMarshal
0be7c1c9a2 Fix for mining.
Fixes #4249
2014-01-09 20:57:47 -05:00
SkyMarshal
e2bbbb7e39 Mining fixes as it was annoying as fuck. Also a random object with nothing in it removed.
Conflicts:
	code/modules/mining/mine_turfs.dm
2014-01-09 20:56:38 -05:00
SamCroswell
c980a4a421 Major Ninja Patch 2014-01-09 20:39:29 -05:00
RKF45
94f38882f9 Removes braindeath as IC term 2014-01-09 20:24:10 -05:00
Zuhayr
3789e82f7b Roasted diona, for ZomgPonies/Paradise.
Conflicts:
	code/modules/reagents/reagent_containers/food/snacks.dm
	icons/obj/food.dmi
2014-01-09 09:14:20 -05:00
ZomgPonies
05e7f65ede Fixing up borer control 2014-01-09 05:29:28 -05:00
ZomgPonies
a405189383 Cult construct abilities fix 2014-01-09 03:03:41 -05:00
ZomgPonies
a59772e5e2 Merge pull request #112 from alex-gh/reagent-fix
typo fix
2014-01-08 21:19:22 -08:00
alex-gh
404ee2ac1f typo fix 2014-01-09 06:02:45 +01:00
Rob Nelson
c14adc6724 Slimes split from a killed adult can understand humans. (#366)
Conflicts:
	code/modules/mob/living/carbon/metroid/death.dm
	html/changelog.html
2014-01-08 21:49:15 -05:00
Rob Nelson
c7215da925 Fix #371 (vermin trying to spawn in assembly line). plus other simple_animal issues.
Conflicts:
	code/modules/events/infestation.dm
	html/changelog.html
2014-01-08 21:49:14 -05:00
Mark Aherne (Faerdan)
e55ba73100 Minor fix for NanoUI
* I was passing src instead of src_object in try_update_ui, this is fixed now.
* Changed checks to use the isnul procl, just to be sure.
2014-01-08 21:22:00 -05:00
alex-gh
d239894e9b Removed water recipe, reagent fixes 2014-01-09 03:00:05 +01:00
ZomgPonies
9be261dd98 Modified Diona speed debuff a bit 2014-01-08 20:39:35 -05:00
ZomgPonies
322001f196 Fix for borers being stolen by other peeps when they are controlling host 2014-01-08 18:57:22 -05:00
Mark Aherne (Faerdan)
4aef8764a8 NanoUI fix.
* Moved the receiveUpdateData JavaScript into the head so that it's loaded first.

This is to prevent an error which occurs if an update is recieved from the server before the UI is fully loaded.
2014-01-08 08:04:06 -05:00
YotaXP
b7efb1b7ed Optimized and refactored list2text, text2list, and replacetext.
Also fixed some grammar in the station blueprint code.

Conflicts:
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/uplinks.dm
	code/modules/admin/verbs/debug.dm
	code/modules/clothing/masks/gasmask.dm
	code/modules/detectivework/scanner.dm
	code/modules/flufftext/TextFilters.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/silicon/ai/say.dm

Conflicts:
	code/modules/admin/verbs/debug.dm
	code/modules/detectivework/scanner.dm
2014-01-08 07:14:16 -05:00
Zuhayr
64972f267d Commit testing? What's that? Single character fix for pulse checking. 2014-01-08 05:39:54 -05:00
ZomgPonies
2a90d59001 Fixing up security level text 2014-01-08 02:52:35 -05:00
ZomgPonies
f0f6513d4c Merge pull request #109 from SamCroswell/master
Various Fixes/Tweaks to Ninja
2014-01-07 22:34:16 -08:00
d3athrow
64d8903802 Following /tg/'s lead, removes set background 1 for smoother gameplay.
Conflicts:
	code/game/objects/effects/glowshroom.dm
	code/modules/mob/living/carbon/zombie/zombie.dm
	code/modules/mob/living/silicon/mommi/life.dm
2014-01-08 01:25:20 -05:00
Mark Aherne (Faerdan)
8d64095078 NanoUI Updates.
* Restructured HTML in an attempt to fix the "blank UI" issue.
* Added a crap ton of debugging messages.
* Added a loading message to the UI.

Conflicts:
	code/modules/nano/nanoui.dm
	nano/js/nano_update.js
2014-01-07 23:28:51 -05:00
ZomgPonies
906d3b80d8 Small nanoui change 2014-01-07 18:24:38 -05:00
d3athrow
f8bee9a356 Fixes nonhumans getting stuck in walk mode after being targetted 2014-01-07 18:14:49 -05:00
ZomgPonies
9e61df6bdb Bugfix 2014-01-07 05:52:52 -05:00
Ccomp5950
58f76c2f4c Ghost chat unicode support...removed unneeded sanitize() 2014-01-07 05:44:19 -05:00
ZomgPonies
6dd2336ae2 Fixed the way Dionas get their names. Should help fluff. 2014-01-07 04:20:57 -05:00
Zuhayr
d856157f26 More dionaea tweaks, NO_PAIN, IS_PLANT and IS_SLOW specifically.
Conflicts:
	code/modules/mob/living/carbon/species.dm
2014-01-07 00:04:27 -05:00
Zuhayr
ab6fb88bf5 Forgot a var. 2014-01-07 00:02:16 -05:00
Zuhayr
f9b8c01c65 Implemented IS_SLOW. 2014-01-07 00:01:52 -05:00
Zuhayr
07c1506551 Implemented NO_PAIN and parts of NO_BLOOD, restructured species flags.
Conflicts:
	code/modules/organs/blood.dm
2014-01-07 00:01:27 -05:00
Zuhayr
e09a00fe0e Fixed a duplicate definition bug with WHITELISTED.
Conflicts:
	code/modules/client/preferences.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/new_player/new_player.dm
	code/setup.dm
2014-01-06 23:59:21 -05:00