Commit Graph

3705 Commits

Author SHA1 Message Date
Joan Lung 27a54d16ff Merge pull request #23051 from Core0verload/defib_fix
Fixes defibrillators
2017-01-17 18:42:57 -05:00
c0 4989e12b45 Fixes defibs 2017-01-16 11:47:18 +03:00
oranges ddb4b89619 Merge pull request #22968 from XDTM/LargeSlime
Fixes large grenade interaction with slime cores
2017-01-14 11:55:10 +13:00
johnthedonut c5d9bb4588 Fixes wetting a mop with a bucket so it wont clean the tile you are standing on. 2017-01-13 22:16:51 +01:00
XDTM 9dd8ff7934 Fixes extinguisher violence (#22928) 2017-01-13 22:14:27 +01:00
Thunder12345 d56b3f469c Shield overlays from shielded hardsuits and nullrod staffs (#22940) 2017-01-12 15:09:25 -05:00
XDTM e8e7af2fc8 Fixes bad message (#22966) 2017-01-12 15:05:02 -05:00
XDTM 44bc3b6cf5 Fixes large grenade interaction with slime cores 2017-01-12 12:25:05 +01:00
kevinz000 0601f1f0f6 Update twohanded.dm (#22904) 2017-01-11 19:49:42 -05:00
oranges 41a6efd987 Revert "Fixes instant summons and probably a few other edge cases" (#22917) 2017-01-10 20:55:26 -05:00
Joan Lung 75999e1c6c Fixes instant summons and probably a few other edge cases (#22890)
* Fixes instant summons and probably a few other edge cases

* woken in a fog don't sweat it
and reckon none of it had come from you

* echo

* no lesson in magic, just untimely dreams

* slapdash code queen
2017-01-11 12:53:05 +13:00
oranges 3ad35c23ab Merge pull request #22869 from Cyberboss/ReagentsShouldNotBeLeftNull
Moves reagents back into atoms. Fixes confusion between reagents/reagents_list
2017-01-11 12:49:02 +13:00
Haevacht 6adb35f57e Should fix the crusher, again, and the offhand runtime (#22836)
* This shouldn;t autoPR.

* should probably use it properly eh

* Update twohanded.dm

* Reeeeeeeeeeeeeeeeeeeeeeeeeeeee.

* 2 less lines, yay for OR
2017-01-10 15:00:20 +13:00
oranges f79476634c Merge pull request #22829 from ChangelingRain/blockedturffix
Fixes a few things considering turfs 'blocked' by a mob
2017-01-10 09:57:43 +13:00
oranges 8af3b6c975 Merge pull request #22828 from KorPhaeron/axe
Fixes energy axe not having the sharp flag
2017-01-10 09:57:20 +13:00
Cyberboss 6e622eedd1 Moves reagents into atoms 2017-01-08 23:02:37 -05:00
Joan Lung 1f85d27652 Fixes a few things considering turfs 'blocked' by a mob 2017-01-07 17:58:51 -05:00
KorPhaeron dbf01363b9 Energy Axe can dismember 2017-01-07 14:19:18 -06:00
bgobandit fbf5c902f6 spelling issues too how quaint 2017-01-07 12:53:27 -05:00
Trugath 4105ca9ea6 Tgmonkey (#22338)
* Monkeys are a bit more of a handful
They will aggro, steal, pick up weapons and stuff bodies in disposals

* search using held_items instead of manually

* Only natural monkies should reliably stun
Natural monkies don't try to stun-lock

* Pushes equip_in_one_of_slots to carbon from human

* Removed unused helper.

* Make the trip and stun only against monkeys
The main reason this is here is for the swarm behaivour.

* Just return true for now. It should flee on next life tick.

* remove blocking call from Life

* stuff_mob_in blocks so make it non-blocking

* add check to stop add/remove in same function
Only occours if the monkey attacks someone who isn't in the enemies list.
This only happens during a monkey swarm. Best to check.

* Fix for monkeys ripping stuff off walls.

* Moved shared emote/weaken down into living
Called the new function knockOVer. Monkey and Secbot both have different
control flow before the shared code.

* Stop monkeys fighting over body

* Remove commented out code

* Reduce flee range

* replace spawn with addTimer by moving code into callbacks

* Move magic numbers to defines
Also removed 900 delay in resisting cuffs as its a useless argument

* Refactor. Attacking has a function: monkey_attack
Combined de-aggro into it

* rework monkeyDrop to force drop
Also check for deleted items when snatching items

* Aggresive can be toggled by an admin
Allows for a mass mob of angry monkies

* Tweak aggressive monkeys to attack each other less
Monkey vs Monkey probability is a define
Warning: Once MVM combat breaks out in large mobs, mayhem insues

* Set the monkey back to idle once it attemps to dispose the body

* fix for aggressive monkeys self-harming

* comment wording fix

* changed walk2derpless to a callback and fixed deathgrip
2017-01-06 14:59:37 +01:00
oranges b32061ea37 Merge pull request #22727 from XDTM/PocketShoes
Fixes storage pockets preventing the use of items on the clothing item
2017-01-06 09:57:45 +13:00
Haevacht 044adf9446 Fixes the crusher, and future twohands required items, equipping to slots (#22712)
* If plants have slotflags they can now be equipped

* now you can have more than one slot_flag
2017-01-06 09:54:50 +13:00
oranges f21b077adc Merge pull request #22698 from ChangelingRain/supermattercount
The supermatter now has a ghost-visible damage display
2017-01-05 19:09:28 +13:00
CPTANT a60172ecf5 Rebalances matter cartridge cost (#22687)
* fixes blocks being applied twice

* revert

* Rebalances matter cartridge cost to prevent material duplication
2017-01-05 19:07:08 +13:00
Haevacht 2e93eeea51 Offhand backup plan (#22679)
* no longer asks the offhand to neatly unwield

should fix the issues??

* re-callbacks the sky bulge

* revert the qdel
2017-01-05 19:05:25 +13:00
XDTM 397f440e10 Fixes pockets 2017-01-04 15:18:16 +01:00
Firecage 50bbf5aa50 Allows syringes and droppers to show their reagents when examined while wearing things such as Science Goggles. (#22618)
* Allows syringes and droppers to show their reagents when examined.

* rearranges my logic

* replaces SEMIOPENCONTAINER with TRANSPARENT

* Silly spelling error fix.

* Moves the defines from flags to container_type to avoid issues with conflicting flags

* changes it back to obj/item/O

* Moves the OPENCONTAINER and TRANSPARENT defines to the reagents.dm
2017-01-04 20:00:46 +13:00
Kyle Spier-Swenson bee4b132a3 [READY]Makes addtimer use callbacks (#22660)
* Makes addtimer use callbacks

* I broke the comment

* I fucked up the regex

* this was a silly idea.
2017-01-04 16:02:56 +13:00
Joan Lung a4dfe50f75 The supermatter now has a ghost-visible damage display 2017-01-03 17:02:28 -05:00
Cheridan d92c8aaa8d Merge pull request #22635 from Mervill/bibleupdate
Basic canUseTopic check for the bible, removed dead code
2017-01-02 08:18:42 -06:00
Kyle Spier-Swenson 280dbe20c3 [Ready] SSthrowing + callbacks! (#22476)
* SSthrowing + callbacks!
Throwing is now a subsystem.
It's low priority, but is a ticker subsystem so is ran before most other subsystems.
To allow for shit to run after the throw finishes, throwing now supports a callback.
A callback datum system was created, conversion of addtimer is planned for another PR.
Throwing now has a limit of 2048 turfs (was 600)
Throwing now ticks every world.tick, and properly converts the speed arg from 1ds to what ever tick_lag is.
Throwing now properly accounts for missed ticks.
Throwing no longer uses sleep.
Throwing should no longer lag since it's not filling the sleep queue up

* Smoother tentacles

* Some improvements

* Missed a spot.

* Makes shit quicker.
Inlines the thrownthing.tick() proc.
Raises missed ticks value
Lowers max dist value
Inlines the two sister overrides for /atom/movable/Moved() because that just seemed like a waste

* >PRs open that use procs i'm removing.

* STOP THE PRESSES!

* throw_at now runs the first throw tick() immediately
This will help some with throwing while running.

* Item throwing now imparts the momentum of the user throwing.

(ie, running in the direction you are throwing makes you throw faster, running away from the direction you are throwing makes you throw the item slower)

* Moves throwing momentum from carbon/throw_item to movable/throw_at.
There are other things that cause a mob to "throw" an item, I figured we keep this universal since thrower is already an arg.

* Explosions throw shit faster.
This was stupid, "Hey, lets set the item's throw_speed to 4 so embedding works, but lets make it throw at the base 2 throw speed for no reason."

* Fixes explosion embedding.
This also acts as a nice example of how to override a callback in an override of throw_at properly.
2017-01-02 20:08:03 +11:00
Mervill 0c1fce9987 organize the code a bit better 2017-01-01 06:07:49 -08:00
Mervill 94a5a4be10 Basic canUseTopic check for the bible, removed dead code 2017-01-01 05:53:49 -08:00
XDTM 1e96ccddb3 Reduces lag caused by bags (#22562)
* Prevents message spam and lag

* Typecache and less rustling

* enforcement go home
2017-01-02 02:11:42 +13:00
Cheridan 08e8a31083 Merge pull request #22516 from Cruix/twohanded_fix_two
Fixed offhands being dropable
2016-12-28 19:58:50 -06:00
bgobandit e9544b8bec Fixes spelling and misleading messages (#22512)
* Fixes spelling and shit

* satiates the kor, fixes more typos/grammar issues

* spelling madness

* I'm mad with spelling power
2016-12-29 10:14:01 +13:00
oranges 7ba57895fe Merge pull request #22486 from Firecage/C4_X4_on_mobs
Fixes issue where X4 and the different C4 could be placed on non-carbon mobs.
2016-12-28 12:37:06 +13:00
unknown b61512cb9e Fixed offhands being dropable 2016-12-27 14:10:11 -06:00
Firecage 8e29b6bb9e Fixes issue where X4 and the different C4 could be placed on non-carbon mobs. 2016-12-27 00:53:59 +02:00
Cruix 20394282ff Fixed some two-handed weapon bugs (#22457)
* Fixed being able to hold twohanded-required items in one hand
Fixed dualsabers changing their weight_class and hitsound when unsuccessfully wielded

* Fixed ctf flags being unpickupable
2016-12-27 09:13:46 +13:00
AnturK 85669e6746 Implants work on /living mobs (#22392) 2016-12-24 13:44:34 -05:00
oranges c3014a47d4 Merge pull request #22309 from optimumtact/destroyisconnectedtotheunequipprocunequipisconnectedtothedropprocdropprocisconnectedtotheunweildprocunwieldprocisconnectedtothedestroyproc
Fix a qdel loop in two handed weapons
2016-12-24 18:59:02 +13:00
bgobandit 666f28aa49 Adds lumps of coal. (#22346) 2016-12-23 09:33:22 +13:00
Joan Lung b480a8bada Merge pull request #22314 from Shadowlight213/clothes
Adds 2 performers outfits.
2016-12-20 13:33:02 -05:00
Shadowlight213 3f70fcd134 adds 2 performer's outfits 2016-12-18 23:44:38 -08:00
oranges 020c6573c5 Fix a qdel loop in two handed weapons
The offhand was deleted in unwield which can be called by dropped, which
can be called by unequip, which can be called by Destroy

By explicitly using wield as a guard, we avoid this
2016-12-19 04:12:56 +00:00
XDTM 56368cacc8 Fixes things 2016-12-19 00:44:27 +01:00
Supermichael777 64ab376212 Makes the checks used by bibles better (#22171)
* makes these checks more flexable

* oh hai mark

* praise jesus

* magicaly a better understanding of how to structure if checks lets me cut 2 lines

* wew

* spellcheck

* i shoudent code drunk

* weeeeew

* llllllaaaaaadddddd

* madcusbad

* i realy should learn desktop git

* wew

* Im just so sorry

* because we can't be having the power of atheism melting clockcult.
2016-12-19 11:34:57 +13:00
Haevacht a6711a7003 Tomb of the Dragoon, and the Sky Bulge lance (#22270)
* Sky Bulge Commit mk2

WORK THIS TIME.

* Indentation.

* Jordbord's suggestions

Incorporated. The bone spear line was also doubletabbed I was set up!

* FUCKING INDENTATION

* the flan update

they don't exist in world but here have a mob

* we fireflans now

also isliving is in now, just gotta actually map a thing

* the tomb update

it's bigger now

* .gitignore revert

* workpls

* Revert ".gitignore revert"

This reverts commit 1fefd34fc7c0dbc8f1f353a95e53665e03ba75cf.

* workthistime

* Revert "workthistime"

This reverts commit 214509d5abda941c470708431536ccd715334e8e.

* well it's the closest gitignore fix so far

* fix dme change

will need to be loaded for the map part to work though

* gitignorerevert take 43

* jordbord fix mk 2

* includes flan.dm in the .dme
2016-12-19 00:12:12 +11:00
danno "big fucking moron" gonzales 5a0c2808af fixes #22222, and also a costume (#22235)
* fixes autodrobe not stocking past 81 items

* villain number one!!
2016-12-17 14:25:34 -05:00