Commit Graph

8920 Commits

Author SHA1 Message Date
Cyberboss 326bdfd76b Finally fixed the proximity runtime (#22950)
* Finally fixed the proximity runtime

Also fixed some misue of Move(d)s and destroys

* Fixed remove_from_proximity_list

* Fine, we'll do it your way

* Should sense/update loc here as well

* Assume deez nuts
2017-01-14 11:52:07 +13:00
oranges 08f830c416 Merge pull request #22946 from coiax/pyro-slimes
Fixes pyroclastic anomaly slime colour
2017-01-14 11:50:57 +13:00
oranges e9605df7cf Merge pull request #22939 from Cyberboss/FlashFix
Fixes explosion flashes
2017-01-14 11:50:32 +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
Cyberboss de454f5a35 The real slips rewrite (#22490)
* Fix a bug in forceMove

Don't call Exited/Entered if the loc is the same

* Added forced_movement

* Remove usages comment

Fixed a parameters bug

* Refactor slips

* Refactors meathook

* Negative check

* Shittier syntax, more performance

* Seperation of src and args

* Sanity check

Because you know someone will fuck it up

* X to Y is inclusive

* Bettter diagonals

* Remove unused var

* Better suggestion

* This was never used, why was it here?

* Arg prefixing...

* Better cleanup

* Do not touch the self managing var

* Cleanup

* More cleanup

* Missed 2

* Added callbacks

* Fix ice again

* Sanity checks

* Applied to larva/attack_hulk

* Fix the chain's usage

* LDFJAHDJKAGFHLJKDSAGHJKLSDAGBLKJADGFHKLJADGNLKAMDFNBJK:ANFDJKLADSNLSJKDFHNASFADSFLK:AJFL:KASJFKLASJF:LAJSF:LKJASKFMSALKF
2017-01-12 13:57:23 +13:00
oranges f4e325e5ed Merge pull request #22765 from Mervill/the_kilt_is_now_op
Hardsuits, amour and other suits that cover the feet now protect against glass shards
2017-01-12 13:54:32 +13:00
XDTM 64e4994fea Fixes material amount (#22954) 2017-01-11 19:51:13 -05:00
kevinz000 0601f1f0f6 Update twohanded.dm (#22904) 2017-01-11 19:49:42 -05:00
Jack Edge 9755818614 Fixes pyroclastic anomaly slime colour
The pyro anomaly was setting the color of the slime incorrectly, meaning
it had a red or orange color but had the wrong name (and probably core
type).
2017-01-11 19:44:25 +00:00
Cyberboss a89a5e2ad1 Fixes explosion flashes 2017-01-11 13:33:13 -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
XDTM af1c991ab4 fixes tk bug (#22819) 2017-01-11 12:46:48 +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 d228c1a4a5 Merge pull request #22529 from bgobandit/fuckinggoof
Portals can no longer be frozen.
2017-01-10 10:43:03 +13:00
Mervill 091c5c669f Fixes runtimes related to blowing up 25 vending machines at once (#22855)
* throw_impact() checks that A exists, preventing issues with violent explosions

* also check !qdeleted(A)
2017-01-10 10:00:42 +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
coiax db44b6297f Fixes smoothing when repairing reinforced walls (#22816)
* Fixes smoothing when repairing reinforced walls

🆑
add: Girders now offer hints to their deconstruction when examined.
:/cl:

Fixes #22805.

- Removes some unused code in unsorted.dm
- Replaces is_pointed with a global list and a #define
- Removes some trailing returns
- Makes thermite use QDEL_IN rather than spawn()
- Girders (especially reinforced girders) now offer hints to how to
destruct them.

* Moves is_pointed to is_helpers
2017-01-10 09:55:04 +13:00
Cyberboss 79a164ff67 Fix explosion dodging. Tweaks door resistance (#22360)
* Attempted fix for explosion dodging

* Refactor turf/ex_act to return the new tuf

* Fixed a dumb

* Fixes more dumbs

* @optimumtact's suggestion

* If it blows up an rwall, it should blow up a door

* Gives firedoors some explosion_block

* Remove debugging

* Remove more debugging

* Fixed a missing ex_act return

* Let's limit this to mobs

Because that's all we care about

* We need to keep this check

Otherwise the proc may crashe and turfs could end up constantly exploding, gibbing anyone who walks through them

* Buffs diamond, centcomm, and external airlocks

* Bigger block for heavy firedoors

* Revert "We need to keep this check"

This reverts commit 47029c9ba02b0332610ec0bac2c908ce1181a01c.

* Revert "Remove more debugging"

This reverts commit b598fb795b79806fc9b4d38919a1f9fb17d29299.

* Revert "Remove debugging"

This reverts commit 68a6bd1c6e8e218dd5dce248c79bf184b4622e2d.

* Revert "Fixed a missing ex_act return"

This reverts commit c3dbe3b99b9035bac8be2930110f9b6db8acec37.

* Revert "Fixes more dumbs"

This reverts commit dc5767f2f2cdcd410afbd46c9fcecfdf7701f028.

* Revert "Fixed a dumb"

This reverts commit c447cfdd8c92a4af61bf776ea11500f9aa52fc99.

* Revert "Refactor turf/ex_act to return the new tuf"

This reverts commit 38ddfca1800dbc67a59e617bd52924f78a17666e.

* The new old fashioned way

* Compile before you push you slitherbrain

* Fixes and solidarity

* Only one circumference please

* Fixed
2017-01-09 18:04:22 +01:00
Cyberboss 6e622eedd1 Moves reagents into atoms 2017-01-08 23:02:37 -05:00
Cheridan 4a03a77244 Merge pull request #22803 from ChangelingRain/tempoverlays
Changes a few things into temporary visual effects
2017-01-08 12:51:07 -06:00
Cheridan 7003e73e97 Merge pull request #22807 from bgobandit/ilovetypos
Fixes photon torpedo description, fixes more grammar shit.
2017-01-08 12:40:01 -06: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
bgobandit a8b2d1f8b8 Foam no longer spreads to transit space turfs. (#22787)
* Foam no longer spreads to transit space turfs.

* Blacklists lava and chasms for foam; blacklists transit turf for xeno weeds

* wait wtf was I thinking
2017-01-07 19:42:42 +13:00
Mervill 8d505d0aa4 pre-placed posters don't retain their pixel offset when taken down carefully (#22760)
* pre-placed posters don't retain their pixel offset when taken down carefully

* use P.forceMove(location)
2017-01-07 19:40:39 +13:00
TehZombehz 492c79edcf Fixes plastitanium false wall icons updating to the wrong icon (#22747)
This affects all false walls, but only plastitanium false walls are
affected because it's initial icon is not named 'wall', it's named
'wall3' which, in the dmi file, is the same as titanium, causing the
false wall to reset to the incorrect icon.
2017-01-06 16:54:46 -05:00
Joan Lung b0f3a27261 Changes a few things into temporary visual effects 2017-01-06 16:45:36 -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 3a77966186 Merge pull request #22728 from XDTM/MechHole
Fixes wormholes not being usable by mechs
2017-01-06 09:58:29 +13: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
Mervill 646d4bc8ee hardsuits, amour and other suits that cover the feet now protect against glass shards 2017-01-05 02:48:40 -08: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
Firecage 8dab2c9c34 Changes the names of Circuit Boards so they are easier on players. (#22688) 2017-01-04 17:20:53 -05:00
XDTM babe7a6aa6 Fixes portals not being usable by mechs 2017-01-04 15:56:50 +01: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
Mervill 422d869a40 [s] Fixes spraycans being silent (#22682)
* The regular spraycan makes noise again, also spraying someone in the face is loud

* There are more then 80 columns in the world today, friends
2017-01-04 19:42:39 +13:00
oranges 3607645380 Merge pull request #22693 from MrStonedOne/revert-22577-ACKACK
Revert "Fixes AIs being able to see cult runes"
2017-01-04 18:38:16 +13:00
Joan Lung c0bdb982f3 Merge pull request #22671 from Mervill/owo_whats_this
Makes parcel descriptions less confusing
2017-01-03 22:25:29 -05: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