Commit Graph

6438 Commits

Author SHA1 Message Date
Razharas e6eab9b7e9 Rewrote stings
Stings are now special cases of carbons' clicks
All the problems with stings-items were solved automatically by this
Clicking the ability sets your active sting
Currently active sting is shown on the UI
Changed sting icons to fit the UI
Clicking other ability will reset the active sting to the new one
Added "retract stinger" ability so you can get rid of any active sting
Added autoequip of items below you if you go from monkey to human form
as ling
Added commented-out greater form, just because
Monkeys now have chem counter in their UI just like humans
Monkeys have active sting icon in UI as well
Hope its not too much commits for one pull request
Also changed some of the previous additiong to ABSTRACT items in
show_inv
2013-11-21 20:36:08 +04:00
Robson Richards ea7db2239d Adds a necessary check against surgeries on Robotic organs
Reworks limb surgery/limb augmentation.dm to use a Switch

Ignore changes to do with "Requires_organic_chest" I removed it, but since re added it as it was preventing an exploit
2013-11-20 18:19:22 +00:00
Laharl Montogmmery b50b1d5633 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.
2013-11-20 14:31:16 +01:00
Laharl Montogmmery d008bbb5ff A lil' bit of commenting.
Who the hell reads those commit comments anyway?
2013-11-20 00:22:10 +01:00
Razharas bb0ce713cb Abstract things stay in hand while on the ground
This means 2 things
1 - you can sting while stunned/weakened and so on
2 - if you are not stunned/weakened but lying - you can grab things
All this ERP potential
2013-11-19 10:04:02 +04:00
Razharas bc6e79b041 The icons and some inventory change
Since my personal icons were considered ok by some people i used them
Added new one for poison sting and tiny tiny bit changed the older ones,
also proboscis is still there just because
Also now put_in_?_hand will check for ABSTRACT flag, things with it will
be put in hand anyway
With this even while downed you can sting someone if you are quick
enough to do it before sting gets deleted from your hand(100% hack but
whatever)
Things like not dropping items from hands completely and other stuff
cheri suggested to make after we switch to v500
If you will find any bugs just tell and ill fix them
Thats probably it, ive done everything i wanted and implemented
everything i was asked for
Now will hope this PR will be merged, would be sad to do all this work
for nothing
2013-11-19 08:24:56 +04:00
Razharas 0473985be4 Abstract items and show_inv, some other things
Abstract things now cant be neither seen in show_inv nor be interacted
there
Added abstract flag to golem armor so now only he himself can see what
he is wearing(seems reasonable to me)
Added my shitty spriting of proboscis and stings to icons/weapons, not
sure it is right play or do we ever need them at all
Actually changed changeling_powers to work with stingers instead of
proboscis, but dont want to push it yet, maybe people will want one
proboscis for all stings instead of separate stingers for each sting
2013-11-19 00:37:33 +04:00
LaharlMontogmmery 912399e756 Unanchored AIs can now be pushed and can bump. 2013-11-18 11:46:04 +01:00
Cheridan c4a8fb5632 Merge pull request #1780 from Giacom/simple_animal_invis
Simple animals will now consider invisibility when attacking and choosing targets.
2013-11-17 23:25:17 -08:00
Razharas 64097d3acb Little fix post haste 2013-11-18 04:02:07 +04:00
Razharas b7b45881b2 Made abstract a flag and other stuff
Everything that had abstract var now has ABSTRACT flag
Everything that checked abstract var now checks ABSTRACT flag
Fixed some runtimes
Fixed click code and face direction changing while cuffed
Added del to all attack_* of the proboscis in case shit goes real
AStar is still weird so added  a simple sanity check
2013-11-18 03:53:50 +04:00
Laharl Montogmmery 34d1a57243 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.)
2013-11-17 23:09:06 +01:00
Robson Richards e71ea3289e Merge branch 'master' of https://github.com/tgstation/-tg-station into 13/10/2013-Limb/organ-stuff
This probably broke everything... :(
2013-11-17 18:09:14 +00:00
Robson Richards 890362a61a Commiting some soft Updates of commits I'm behind on and Committing the rest via git. 2013-11-17 18:02:43 +00:00
Razharas 26c24d42bd Accidently added this thing
No need for it
2013-11-17 02:21:17 +04:00
Razharas 6d0bbc8b24 Further improvement of ling code
Yadda yadda
2013-11-17 02:09:43 +04:00
Giacom ec44b2fde8 Merge pull request #1781 from JJRcop/borg-tweaks
Cyborg consistiency, deconstruction tweaks
2013-11-16 12:15:42 -08:00
Robson Richards 637c3f7f63 Fixes for @Aranclanos
Diseases now have a requires and a required_limb variable
if requires is 1 then it will run a check for required_limb (WHICH USES TYPEPATHS)

Reverts a turret change that git through into the pull for some reason

added some feedback messages in certain places

removed the hulk-like snowflake check that was really crappy anyways

Reworked a part of surgery/surgery_step.dm to use a switch
2013-11-16 18:13:41 +00:00
Cheridan 16b2bc833f Merge pull request #1753 from Giacom/tele_sci_tweak
Telescience Update
2013-11-14 15:30:01 -08:00
JJRcop 1243552f6b Resolved "cover" vs "panel" terms conflict in cyborgs, "cover" wins
Correcting every instance of calling the "cover" a "panel".
Also, tweaks to cyborg deconstruction so it's more forwards-compatible.
2013-11-13 18:50:30 -05:00
Giacomand 86e63d8504 * Simple animals will now consider invisibility when attacking and choosing targets.
* Renamed SA_attackable to CanAttack(). Moved relevant code into there. Should make mobs more responsive with their targets.
2013-11-13 22:32:18 +00:00
Cheridan bc7b8b8e64 Merge pull request #1762 from fleure/watertanktwo
Added watertank backpack and put on map
2013-11-12 19:11:34 -08:00
Giacomand b8c031026c * Telescience now works on bluespace crystals, which are special crystals which unlock power settings from the telescience computer.
* The telescience computer starts with 3 artificial crystals.
 * The crystals can be crushed to blink or you can throw it at someone to make them blink a short distance.
 * You cannot teleport the AI or any anchored mob (unless they are buckled to an office chair).
 * You can make the bluespace crystals from slimes or from research.
2013-11-12 14:24:56 +00:00
fleure c860235a51 Added watertank backpack and put on map 2013-11-11 19:08:37 +00:00
Robson Richards ad0081e275 New Human EMP_act
Old one was shite and I broke it somewhere
2013-11-10 16:20:20 +00:00
Robson Richards 2d3c6415b3 Adds a robotic limb heal proc
this is due to the original proc having a check in it now which saves us
millions of snowflakey checks, if you wish to heal a robotic limb use
heal_robotic_damage(brute,burn) it functions the same as heal_damage
but actually heals robotic limbs instead of organic ones

Updated the welding and wiring repairs to use this proc
2013-11-10 12:58:44 +00:00
YotaXP d1827c6466 Removes the empty Status tab that is active by default at login.
Has no effect for admins.
2013-11-10 01:53:59 -05:00
Robson Richards b2b6a9ff84 Fixes Chem healing and Chem damaging of Robotic limbs
Hey @Cheridan NO ISTYPES! :D
Ugh.. I mean "Removes" 10 totally unnecessary istypes
Fixes the healing of robotic limbs so that the message actually doesn't display now.

Credit to ACCount12 for digging around and finding some nifty code
that my brain never thought of
2013-11-10 01:55:40 +00:00
Giacom 258a2bd3f6 Merge pull request #1729 from MrPerson/zone_of_the_blenders
Basic usage of blend_mode
2013-11-09 15:04:41 -08:00
Aranclanos 6177c28bbe Merge pull request #1687 from Giacom/alien_candidate
When the game tries to find players for roles it will now prioritize players who are the least afk
2013-11-09 10:18:44 -08:00
Aranclanos 2295080ea3 Merge branch 'medmech' of https://github.com/fleure/-tg-station into medmech
Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm
2013-11-09 15:14:48 -03:00
MrPerson c197201d46 Basic usage of blend_mode
Areas - fire and party alarms look better
Druggy 420 blazeit screen looks better
The whiteness of a flash looks nicer. Mob code makes me hesitant to really change this.
The nearsighted/welding mask dither looks better

If you want screenshots just ask.
2013-11-08 16:48:20 -08:00
Giacom 9f5f30eb68 Merge pull request #1670 from Cheridan/Bugs
Bugfixes
2013-11-07 09:08:57 -08:00
Giacom 00621f7817 Merge pull request #1671 from Neerti/hud_addition_01
Adds a plasma storage HUD for aliens.
2013-11-07 04:25:28 -08:00
Cheridan 655e841239 Merge pull request #1693 from Giacom/fix_1691
Fixes #1691 by limiting the show_message proc.
hey so can i just type whatever i want in here when i merge something?
2013-11-06 16:15:09 -08:00
Fleure aaf68d2a12 Included additional structures to escape from 2013-11-05 00:26:30 +00:00
AlexanderUlanH 6a05692075 Removed unnecessary check
Doopiddy doop, thanks Kaze.
2013-11-04 14:52:44 -05:00
AlexanderUlanH cd4a6af6b1 Fixes another DNA runtime
Public service announcement: check_dna_integrity(mob) before trying to
touch mob.dna.
2013-11-04 14:40:18 -05:00
sirbayer c6c1dbd363 Merge branch 'master' of https://github.com/tgstation/-tg-station into srsbsns-improvedprojectiles 2013-11-01 20:32:04 -07:00
Giacomand 476b64bd76 Fixes #1691 by limiting the show_message proc. 2013-11-01 23:51:00 +00:00
Robson Richards a9b725db2f Lot's of stuff, Read full Commit log
Cybernetic limbs
Multi-location operations
Limbs have sprites now (They never dropped before so it was irrelevant)
No Organic healing of Robotic limbs (But the message is still there, fixing soon)
No "organic" diseases in Robotic areas
No more operations in robotic areas - Cheer's Pete for the surgery system being so nice
Healing Robotic limbs with welders (brute) and cable (burn)
Probably other things I forget
2013-11-01 19:44:07 +00:00
Giacomand 8557cb22df When the game tries to find players for roles it will now prioritize players who are the least afk.
For example, it will try to find players that are afk for 5 minutes or lower, if it fails it'll add a minute to the 5 minutes until it finds a candidate or until it reaches 10 minutes.

I changed the get_candidate for aliens so that their 5 minute bracket is instead 45 seconds. This is because a lot of the time larva need to be active ASAP to avoid danger (such as being spawned in dangerous areas) There was a cases of an AFK larva that was very easily killed of, making it fraustrating for the observers watching.
2013-11-01 18:29:49 +00:00
Giacom d77963bc43 Merge pull request #1683 from Miauw62/borgshaker
Improved cyborg shakers.
2013-10-31 05:56:05 -07:00
sirbayer 19e51caef0 Modification of .gitignore to include admins.txt. Hopefully.`
Added myself to admins.txt for testing.

Merge branch 'srsbsns'

Fucking finally figuring out how to make admins.txt be ignored.

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

stuff

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

latest setting for tgstation.dme

deeply do I loathe these files

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

God I hate gitignore

Merge branch 'master' of https://github.com/tgstation/-tg-station

Modification of .gitignore to include admins.txt. Hopefully.`

Added myself to admins.txt for testing.

Merge branch 'srsbsns'

Fucking finally figuring out how to make admins.txt be ignored.

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

stuff

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

latest setting for tgstation.dme

deeply do I loathe these files

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

God I hate gitignore

Merge branch 'master' of https://github.com/tgstation/-tg-station

Modification of .gitignore to include admins.txt. Hopefully.`

Added myself to admins.txt for testing.

Merge branch 'srsbsns'

Fucking finally figuring out how to make admins.txt be ignored.

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

stuff

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

latest setting for tgstation.dme

deeply do I loathe these files

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

God I hate gitignore

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge remote-tracking branch 'remotes/origin/srsbsns-improvedprojectiles' into srsbsns-improvedprojectiles

Conflicts:
	config/admins.txt
	data/investigate/singulo.html

I don't what I'm doing

Massive overhaul to automatic gun functionality, intended primarily to
allow partially-filled magazines to be released.

Now it compiles and doesn't throw runtimes! Also chambering rounds works
right! Unfortunately the contents still need to be looked at, the Russian
Revolver isn't working, and the Bartender's shotgun is just a nightmare.
Also you still can't eject mags.

Mags eject, most gun work. Shotguns still have a problem with reloading
and chambering. Russian Revolver is a bitch.

Heavy finalizing touches. Fixed references to changed trees. Added
icon_states for some magazines. Fixed revolver glitches and subtyped
double-barreled shotguns to revolvers to fix its glitches. Made bullets
and spent shells more obvious via graphical changes. Probably did some
other things but I can't think of what they'd be.

Sprite tweaks for final preparations for pull request.

final FINAL finalizations.

Adding full paths to overwritten procs for simplicity's sake.

Fixing damaged .gitignore and config/admins.txt.

Finalization for pull preparation. Clean up some descs, eliminate data folder.
2013-10-30 17:56:00 -07:00
Giacomand dc8f30b1ec * Removed the deleted files from vox_sounds.dm 2013-10-30 19:44:17 +00:00
JJRcop 402733f3b8 Made period and comma sounds completely silent, and turned them Vorbis 2013-10-30 14:50:28 -04:00
Giacomand 58678a7f3b Merge branch 'master' of https://github.com/tgstation/-tg-station into ai_vox_boogaloo 2013-10-30 15:22:14 +00:00
Aranclanos 2888ade897 Merge pull request #1655 from Giacom/robot_violin
Added the space violin to the service cyborg modules + MORE [CHANGELOG]
2013-10-30 08:19:22 -07:00
Miauw 04faefd5d9 Improved cyborg shakers. They now synthesize all base drink ingredients. 2013-10-29 22:02:00 +01:00
Giacom eff970ba7b Merge pull request #1657 from Jordie0608/veryspooky
Space Bats
2013-10-28 05:37:33 -07:00