Commit Graph
7894 Commits
Author SHA1 Message Date
phil235 441a88c488 Megaphone no longer have special say code to handle their effect.
The megaphone is no longer used by clicking it and entering a message, you simply keep it in your active hand and talk normally.
Remove the insults feature of the emagged megaphone. The span of the emagged megaphone is now big and red.
2016-09-13 18:27:55 +02:00
AnturKandGitHub 4709b5229b Merge pull request #20475 from optimumtact/throwat
Fix a bunch of incorrect throw_at proc definitions that caused a runtime
2016-09-13 15:41:00 +02:00
orangesandAnturK ded3bbc695 Fix legion hivecore incorrect preserved method definition (#20473)
* Fix legion hivecore incorrect preserved method definition

It will now correctly handle the implanted variable and pass it through to the parent so the handling can trigger

* Make sure default matches parent

* Proper parent call
2016-09-13 15:39:03 +02:00
phil235 37d1ea6108 Make sure talk_wheel_icon var is properly deleted when hud is deleted.
Add a hotkey for the talk wheel: H (hotkey mode) and Ctrl+H.
Fixes not being able to use the wheel and talk button while stunned.
2016-09-13 15:22:41 +02:00
oranges 6fbcc6e26b Fix a bunch of incorrect throw_at proc definitions that caused a runtime 2016-09-12 22:09:52 +00:00
Joan Lung 179b0b532d Merge branch 'master' of https://github.com/tgstation/tgstation into idigtilmyshoveltellsasecretsweartotheearththatiwillkeepitbrushoffthedirtandletmychangeofheartoccur
Conflicts:
	code/game/objects/structures/grille.dm
	icons/effects/beam.dmi
2016-09-12 17:14:39 -04:00
Incoming 68ada71758 Merge branch 'master' of https://github.com/tgstation/-tg-station into why_did_this_take_months
# Conflicts:
#	code/modules/surgery/bodyparts/bodyparts.dm
#	icons/mob/mutant_bodyparts.dmi
2016-09-12 16:35:08 -04:00
Joan Lung f10ac32b69 Merge branch 'master' of https://github.com/tgstation/tgstation into takingbackanemptythreatmorethanyoucouldeverknowtakeitbackwithnoregretsiwasbetteroffwheniwasonyoursideandiwasholdingon
Conflicts:
	icons/mob/mob.dmi
2016-09-12 15:10:29 -04:00
phil235andAnturK 443a4501ec Carbon Dismemberment , second attempt. (#20461)
* - I rearranged X_defense.dm mob files, more damage_procs.dm.Here's what's inside:
* X_defense.dm: is for the procs of attacks onto the mob, all the XXX_act() proc (things happening to the mob), as well as protection check and get procs (armor, ear prot, projectile dismemberment)
* damage_procs.dm: actual damage procs like adjustBruteLoss() getfireloss, any proc that handles damaging.

- some bugfixes with gibspawner effects.
- monkey's bodyparts can be dismembered and are used to create its icon.
- brains are no longer carbons.
- all carbon have bodyparts that can be dropped when the mob is gibbed.
- adminspawned bodyparts now have a default icon.
- robotic parts are now a child of bodyparts.
- health analyzer on alien/monkey shows damage on each limb
- added admin option to add/remove bodyparts for all carbon (instead of just remove on humans)
- Fixes keycheck message spam for janicart and all when trying to move.
- Fixes bug with buckling to a scooter while limbless.
- removed arg "hit_zone" in proj's on_hit() because we can already use the def_zone var (where hit_zone got its value)
- Fixes mob not getting any damage when hit by a projectile on their missing limb, despite a hit message shown). carbon/apply_damage() now when we specify a def_zone and the corresponding BP is missing we default to the chest instead of stopping the proc. Consistently with how human/attacked_by() default to its attack to chest if missing limb.
- Fixes mini uzi icon when empty and no mag (typo).
- I renamed and changed a bit check_eye_prot and ear prot
- renamed flash_eyes to flash_act()
- I made a soundbang_act() similar to flash_act but for loud bangs.
- added a gib and dust animation to larva.
- husked monkeys
- no damage overlay for husk or skeleton.
- damage overlay for robotic limb now.
- no damage overlay when organic bodypart husked.
- one handed human with a bloody hand still get a bloody single hand overlay.
- fix admin heal being unable to heal robotic bodyparts.
- slightly touched robotic bodypart sprites (head one pixel too high)
- Fixes 18532 "beheaded husk has hair".
- Fixes 18584 "Ling stasis appearance bug"
- no more eyes or lipstick on husks.
- can remove flashes/wires/cells from robot chest and head with crowbar.
- Fixes not being able to surgically amputate robotic arm/leg.

* More merge conflict fixes and adding the new files I forgot to add.

* of course I forgot birdstation

* More typos and stuff I forgot to undo.

* Fixing a typo in examine.dm
Removing an unnecessary check.
Making admin heal regenerate limbs on all carbons.
Monkey-human transformation now transfer missing limbs info and presence of a cavity implant.
NODISMEMBER species can still lack a limb if the mob lacked a limb and changed into that new species.
Changeling Regenerate ability now also regenerate limbs when in monkey form. (and remove some cryptic useless code)

* Fixing more conflicts with remie's multihands PR.

* Fixes runtime with hud when calling build_hand_slots().
Fixes lightgeist healing not working.
Fixes null.handle_fall() runtimes with pirate mobs.
Fixes typo in has_left_hadn() and has_right_hand().

* Derp, forgot to remove debug message.
2016-09-12 19:33:50 +02:00
Joan Lung 6bc1981246 may this also die 2016-09-12 10:43:14 -04:00
Joan Lung 1616b7a237 Removes the horrible anim() proc and a bunch of spawns 2016-09-12 09:25:59 -04:00
oranges 5809d3a419 Further improved puns when humans are dismembered 2016-09-12 00:14:38 +00:00
Joan Lung dc930b9da8 this is so fucking dumb 2016-09-11 18:38:14 -04:00
JordieandGitHub 0bda9aa177 Merge pull request #20426 from lzimann/patch-14
Changes 'Notes Memory' verb's name back to just 'Notes' again
2016-09-11 14:38:43 +10:00
Remie Richards c50fa5729c Merge branch 'master' of https://github.com/tgstation/-tg-station into many_hands_make_light_work 2016-09-10 20:28:23 +01:00
Joan Lung fbe2430ff8 Moves all beam icon states to beams.dmi 2016-09-10 13:09:44 -04:00
LeoandGitHub 277069a06f Changes 'Notes Memory' back to just 'Notes' again 2016-09-09 23:37:09 -03:00
Remie Richards f145a05f49 clarifies bodyparts != organs 2016-09-09 20:16:40 +01:00
Joan LungandGitHub 5bdfd1665f Merge pull request #20328 from Ergovisavi/bring_colossus_back_2016
New colossus loot, the "Anomalous Crystal"
2016-09-08 22:38:50 -04:00
Ergovisavi 114676c548 Finishing up anomalous crystals 2016-09-08 19:29:49 -07:00
Joan LungandGitHub 9842424260 Merge pull request #20399 from TechnoAlchemisto/revert-20352-allaboardthenerftrain
Re-adds the touch effect of legion souls.
2016-09-08 22:29:47 -04:00
Joan Lung f22286e073 Fixes drake fire breath multihitting 2016-09-08 08:57:15 -04:00
JordieandAnturK 4e3b001142 Adds note secrecy to allow hiding notes from non-admins (#20280)
* adds note secrecy to allow hiding notes from non-admins

* fixes not seeing own notes

* renames notes to notes memory

* notes secrecy defaults to 1

* prompt during note creation for note secrecy

* Update NewBan.dm

* Update topic.dm

* Update sql_notes.dm

* Update client_procs.dm

* webclient tabbing error fix

* made cid detector notes non-secret
2016-09-08 11:49:24 +02:00
TechnoAlchemistandGitHub effc432637 Line 278 Spacing 2016-09-08 00:53:44 -07:00
TechnoAlchemistandGitHub dc11b8d26d Fixes 2016-09-08 00:47:04 -07:00
TechnoAlchemistandGitHub 4d7ffdc054 Revert "Legion soul now only heal when implanted" 2016-09-08 00:38:54 -07:00
Leoandoranges b5ed7a0416 Legion soul now only heal when implanted (#20352)
* Legion implant no longer heals

* Changes back to 2 blood regen

* Changes how legion souls work
2016-09-08 17:39:24 +12:00
Iamgoofballandoranges e68f52b609 LOGGING CODE IS GARBAGE (SPEEDMERGE) ~~FIXES FREON LAG~~ (#20378)
* LOGGING CODE IS GARBAGE (SPEEDMERGE) ~~FIXES FREON LAG~~

disables logging for freon ice slips, good thing we got profiling and witness testimonies

* Update carbon_movement.dm
2016-09-08 13:02:55 +12:00
Ergovisavi 4e4f091905 Merge branch 'master' of https://github.com/tgstation/-tg-station into bring_colossus_back_2016 2016-09-07 01:08:58 -07:00
Ergovisavi 8605809c57 New colossus loot, the "Anomolous Crystal" 2016-09-07 00:58:15 -07:00
CheridanandGitHub 25637d3521 Merge pull request #20346 from ChangelingRain/pleasecomebackiknowicantoffermuchthebodiesicangiveyouareweakthestoriesitellareimpossiblemyworldisevenmoreprecariousthanthisonebutpleasecomeback
SIZABLE FOWL tweaks and fixes
2016-09-06 15:54:55 -05:00
CheridanandGitHub 3b982dd7f2 Merge pull request #20339 from ChangelingRain/ithurtstoseeyoulikethissomuchsounhappyinthosebodiesofyoursstrickenbythosestoriesforcedtoliveinsomuchpain
Fixes the weird persistent ghost hearing bug
2016-09-06 15:42:17 -05:00
Joan LungandAnturK b208e41add Watchers are now actually flying and will not fall into chasms (#20344) 2016-09-06 13:46:56 +02:00
ErgovisaviandKorPhaeron 45394ad65d Stops dragons from flying across space to smash you with perfect accuracy (#20312) 2016-09-05 16:42:38 -05:00
Joan Lung 84e67f3554 SIZABLE FOWL tweaks and fixes 2016-09-05 15:37:03 -04:00
Joan Lung 210d9c3b1b Fixes the weird persistent ghost hearing bug 2016-09-05 10:53:25 -04:00
Joan Lungandoranges 7711fba9bd The Hierophant (#19921)
* HIEROPHANT

* whoops

* that'd be hilarious but unwise

* BIRD_SCORE

* density

* BIRD THREAT

* maybe a threat tm

* danger boss

* it's always the paren

* bird murder

* recall

* no message

* yelling bird

* time
time
come on, time
time
shades

* A ruin!

* I think five blasts is enough

* birdboss wants you dead

* giant boss arena

* hierophant no longer literally unfightable

* smaller ruin?

* no longer innate

* can toggle friendly fire, teleport is AoE

* comments!

* just fucking spawn the arena wew

* heal on resetting

* not as common

* I cannot be trusted

* eeeh

* !

* keep it off the station

* as common as sin

* stop cheesing the boss you asshole

* this looks better

* that ruin didn't even exist what the fuck

* wew

* rip

* it doesn't need full healing if it heals for half when it resets

* good for fighting mobs

* rune where you are

* mechanics; armor doesn't fucking matter rip you

* armor matters but not much so

* )

* meaner than hell and more likely to kill you

* remove those beasts from my beautiful square house

* fix

* you should be able to tell what it's doing, even if you can't actually react to it
being totally unable to tell what the fuck just killed you is bad design, you should know how you died even if you couldn't do shit
rip 3x3 chaser

* start higher scale to the same

* the ruin that doesn't exist and costs 10 points to place

* now what's all this commented out stuff hmmmmmmmmmmm
what could it possibly be

* accurate

* tracking

* boring unused lore

* it needs to be open, oranges. open.

* I did that specifically to note which commit it was on ree

* oh there's a proc for that. duh.

* logging is good

* horrifying

* the marginal kindness of a giant bird boss

* ruin tweak

* idiot bird

* adjust
2016-09-05 10:05:35 +12:00
CheridanandGitHub 5304510121 Merge pull request #20303 from ChangelingRain/shootmedownofcourseimthesinfuloneherebutnowivefoundareasontofeelnofear
Bubblegum's charge now goes the full distance to the target
2016-09-04 13:38:25 -05:00
MMMiraclesandoranges 1b4318f1a2 Combat Bears (#20215)
* adds bear

* bear armor dlc

* bear upgrades galore
2016-09-04 09:51:03 +12:00
orangesandGitHub ebcde4fe56 Merge pull request #20290 from ChangelingRain/feetdeepintheeartharmsdeepinthedusthandsonthemountainseyesinthesea
Fixes some potential weird faction bugs
2016-09-04 09:47:37 +12:00
orangesandGitHub c34bcaa9ad Merge pull request #20264 from GunHog/Silicon_Ghost_Laws
Ghosts may now examine silicons to read their laws.
2016-09-04 09:45:33 +12:00
Joan Lung 42acfb5571 range 2016-09-03 16:06:04 -04:00
Joan Lung c4ffc23499 rip position 2016-09-03 16:04:37 -04:00
Joan Lung 4813791163 non-random 2016-09-03 14:56:53 -04:00
Joan Lung 950851b5a7 it's comin at ya 2016-09-03 14:34:42 -04:00
Joan Lung 246c6cf5d6 'insert horrifying roar here' 2016-09-03 14:30:32 -04:00
Joan Lung 266bacf4c8 Bubblegum now charges past its target's location 2016-09-03 12:09:08 -04:00
Remie Richards 09fee94db5 Second round of fixes:
- Fixed+Future proofed Mutant Parts Sprites
- Fixed Lesser Summon Guns activating the wrong hand
- Fixes stacks merge()ing with and consuming themselves
2016-09-03 11:40:21 +01:00
AndrewJacksonThe2nd 8298331538 fixes 2016-09-02 15:57:15 -07:00
AndrewJacksonThe2nd 082b4e4821 Merge branch 'master' of https://github.com/tgstation/-tg-station into goofmos
Conflicts:
	code/game/turfs/open.dm
	code/modules/mob/living/living_defines.dm
2016-09-02 15:51:26 -07:00