Commit Graph

3475 Commits

Author SHA1 Message Date
ZomgPonies
2f2e6c611f Re-added? Stop drop and roll 2014-01-16 03:47:26 -05:00
ZomgPonies
d40ebc5cc5 Revert "Tradeband and Gutterspeak now have a different font than Tradeband."
This reverts commit b5906bba39.

Conflicts:
	code/modules/mob/living/carbon/human/human.dm
2014-01-15 06:54:46 -05:00
Incoming
048ed6e9fd [tumblr approved] Sausage Party Reduction
*Lets adamantine golems and ninjas generate female where before they were generated exclusively male.

The ninja spacesuit has a coded in female variant that has existed forever but was not actually used. It only shows up upon suit ACTIVATION because (?:?:?)|\|i|\|j4c0d3(?:?:?).

Likewise female adamantine golems have their own sprites and can show up in staff of change shots, but ones generated from the rune were always male.

This does NOT effect admin summoned unknown humans, those are all still male.

Conflicts:
	code/modules/events/tgevents/ninja.dm
	code/modules/mob/living/carbon/metroid/metroid.dm
2014-01-14 22:55:39 -05:00
d3athrow
f16a6a83db clean up the code
Conflicts:
	code/modules/mob/mob.dm
2014-01-14 04:30:13 -05:00
d3athrow
bf275e1964 Should fully resolve issue #344
Conflicts:
	code/modules/mob/mob.dm
2014-01-14 04:25:24 -05:00
ZomgPonies
1dc7b05b76 Gibsound changes 2014-01-14 04:17:42 -05:00
Hornygranny
95835ac98c Changed neurotoxin from a child of energy to a child of bullet
Conflicts:
	code/modules/projectiles/projectile/bullets.dm
2014-01-13 04:36:15 -05:00
Hornygranny
550d9b2e76 Extra indents removed 2014-01-13 04:27:44 -05:00
Hornygranny
5a443e5010 Replaced spaces with tabs. 2014-01-13 04:27:18 -05:00
Hornygranny
6eefff2c68 Code by Giacom. Changes alien neurotoxin spit to dumbfire.
Conflicts:
	code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
2014-01-13 04:27:08 -05:00
ZomgPonies
d24cdd2f10 Added a gib sound effect 2014-01-13 02:11:15 -05:00
ZomgPonies
33d1461293 Showing brain part deux 2014-01-12 23:14:35 -05:00
Rob Nelson
55e918cc6a Wire hacking recode from /tg/.
Conflicts:
	baystation12.dme
	code/__HELPERS/mobs.dm
	code/defines/obj/weapon.dm
	code/game/machinery/alarm.dm
	code/game/machinery/doors/airlock.dm
	code/game/machinery/machinery.dm
	code/game/machinery/vending.dm
	code/game/objects/items/devices/paicard.dm
	code/game/objects/items/weapons/explosives.dm
	code/global.dm
	code/modules/assembly/signaler.dm
	code/modules/mob/living/silicon/mommi/life.dm
	code/modules/mob/living/silicon/mommi/mommi.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/robot/wires.dm
2014-01-12 22:37:55 -05:00
ZomgPonies
719c254817 Showing brain first pass 2014-01-12 08:42:03 -05:00
ZomgPonies
cf79a5f972 Fix puking over skeletons 2014-01-12 00:16:40 -05:00
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
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
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
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
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
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
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
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
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
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
ZomgPonies
2aaa601aac Part 2 diona update commits 2014-01-06 23:45:22 -05:00
Zuhayr
2c677b2e48 Reusing some unused flags in species.
Conflicts:
	code/setup.dm
2014-01-06 23:35:14 -05:00
ZomgPonies
ce64847903 Fix borg module bug 2014-01-06 23:25:25 -05:00
errorage
46c2645546 - Clicking on an item in your modules list now instantly moves it, the delay between click and it moving to the active module slot, which is seen in the video, is no longer there. 2014-01-06 20:57:35 -05:00
errorage
eeeb68638f Partial commit for the cyborg UI upgrade, which gets rid of the pop-up window for module selection, instead displaying the available modules in storage-item like fashion.
Conflicts:
	code/_onclick/hud/_defines.dm
	code/_onclick/hud/robot.dm
	code/game/objects/items.dm
	code/modules/mob/living/silicon/robot/inventory.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/mob_defines.dm
2014-01-06 20:57:04 -05:00
ZomgPonies
b857c90f6c Compile fix 2014-01-06 17:47:20 -05:00
Fira
70f50e7850 Partial fix for pAI emotes (they still can't hear beyond one container
level, will require a say/emote code hack)

Conflicts:
	code/modules/mob/mob_defines.dm
2014-01-06 17:46:51 -05:00
Cheridan
f72bb35e26 Ninja Death Tweak
THE CODE NO LONGER CHECKS IF THE MOB IS A NINJA EVERY TIME SOMEONE DIES

NINJAS GET EXPLOSIVE IMPLANTS TO DUPLICATE THE OLD FUNCTIONALITY

YES I'M MAD

Conflicts:
	code/modules/events/tgevents/ninja.dm
	code/modules/mob/living/carbon/human/death.dm
2014-01-05 22:29:21 -05:00