Commit Graph

5599 Commits

Author SHA1 Message Date
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
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
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
Joan Lung
624ea1352c Adds a wrapper for flick_overlay() (#22642)
* Adds a wrapper for flick_overlay()

* are you sure
2017-01-04 07:55:45 +13:00
Joan Lung
feede86b09 Adds a proc for duplicate-avoiding associated list keys (#22608)
* Adds a proc for duplicate-avoiding associated list keys

* neat
2017-01-04 07:30:46 +13:00
Mervill
49d51da5c5 adds weightclass2text(), updates package names based on item size 2017-01-02 18:02:40 -08:00
Cruix
ba1ff745b1 Fixed being able to pull lockers out of wrapping paper (#22648) 2017-01-02 16:58:01 -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
coiax
570cc49db4 Cyborg reboot board tweaks (#22508)
* Cyborgs reboot board tweaks

- Cyborgs now play the "I LIVE AGAIN" noise when rebooted, to give a
little bit of audio feedback.
- We use the grab_ghost() proc, because it's standardised.

* Only play the sound if the cyborg has a mind
2016-12-29 10:12:57 +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
oranges
b7fb6eca98 Merge pull request #22480 from ChangelingRain/convertfix
Fixes a bug
2016-12-28 08:58:36 +13: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
Joan Lung
21d01c3669 Fixes a bug 2016-12-26 14:30:13 -05:00
oranges
58e21ba5a8 Merge pull request #22433 from lzimann/lzimann-patch-1
Fix lollipop dispenser message
2016-12-26 14:39:49 +13:00
oranges
a5a5dcdeba Merge pull request #22416 from Militaires/kill_me
fixes my glass message tweak fuck-up
2016-12-25 16:20:03 +13:00
Joan Lung
95af0534f6 MMI'd clockcultists put in AI cores will properly lose clockcult status (#22369)
* MMI'd clockcultists put in AI cores will properly lose clockcult

* uuuuugh

* fix the core while we're at it

* "

* mrrp

* this will also follow you around

* hmm
2016-12-25 16:18:55 +13:00
oranges
2e936a0db7 Merge pull request #22425 from Shadowlight213/branchnametbd
Fix bundle
2016-12-25 16:14:33 +13:00
AnturK
85669e6746 Implants work on /living mobs (#22392) 2016-12-24 13:44:34 -05:00
Leo
80852b70f6 Fix lollipop dispenser message 2016-12-24 12:15:41 -02: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
Shadowlight213
5dd264102e Adds arrival shuttle to radstorm protected areas
Fixes spider structures having null armor
Fixes division by 0 with hellcan
Fixes runtime in automatons
Fixes runtime with recharger in modular computer destroy
Fixes runtime in power monitor
2016-12-23 18:50:10 -08:00
bgobandit
666f28aa49 Adds lumps of coal. (#22346) 2016-12-23 09:33:22 +13:00
coiax
243fd295b4 Cyborg upgrade board tweaks (#22211)
* Cyborg upgrade board tweaks

🆑 coiax
add: Cyborg renaming boards cannot be used if no name has been entered.
del: Cyborg rename and emergency reboot modules are destroyed upon use,
and not stored inside the cyborg to be ejected if modules are reset.
/🆑

Reasons: Because being renamed "default name" isn't fun, and it means
you have to hang around to be renamed AGAIN. And for lore/balance/sanity
reasons, you don't get to get the reboot board back after you used it;
try dying less.

* Naming changes, and transformer tweak

- A new unnamed cyborg will copy the user's prefered cyborg name if
possible, defaulting to the old format if there's no preference.
- A rename board with no setting will apply the cyborg's default name,
if one exists, see above.
- Cyborg transformers (from the traitor AI) will no longer destroy all
items.

* Made behaviour more consistent

* Fix spelling
2016-12-23 09:31:03 +13:00
militaires
edc58d99ac aaaaaaaaaaaaaa haaaaaaaaasaaaaaaaaaaaayaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 2016-12-22 16:52:34 +03:00
Joan Lung
b480a8bada Merge pull request #22314 from Shadowlight213/clothes
Adds 2 performers outfits.
2016-12-20 13:33:02 -05:00
Cheridan
6535759999 Merge pull request #22304 from XDTM/Abfixors
Fixes a couple of abductor bugs
2016-12-19 20:00:02 -06: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
kevinz000
079b377172 [READY]PAI PATCH 2 (#22214)
* shit

* shit2

* ...

* ....

* ...

* stuffs

* fixes

* dup

* stuff

* lights and jets

* ...

* wew

* ...

* ...

* wew

* ...

* ..

* .

* Update life.dm

* Update life.dm
2016-12-19 15:33:34 +13: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
MrPerson
94eac6ca0e Fix electric chairs not working sometimes (#22250)
Fixes #22155
2016-12-17 18:25:37 -05: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
KorPhaeron
0e8a1d975d These things also belong in a museum (#22139)
* Curator Items

* Spawns in his bookbag because where else would this stuff go

* Revert "Spawns in his bookbag because where else would this stuff go"

This reverts commit c3a8613b01a8ac99b0d44e7eeb2e69fa8ca5801c.
2016-12-15 13:40:30 +13:00
oranges
a40b3eede7 Merge pull request #22204 from bgobandit/gamebreaker
Removes the Head of Personnel
2016-12-15 11:31:54 +13:00
bgobandit
1ce92049e3 Fixes a typo 2016-12-14 17:29:26 -05:00
coiax
4556cf5e29 Adds multiple upgrades for Medical cyborgs (#22149)
* [WIP] Adds multiple upgrades for Medical cyborgs

🆑 coiax
add: Adds upgrades for the medical cyborg!
add: The Hypospray Expanded Synthesiser that adds chemicals to treat
blindness, deafness, brain damage, genetic corruption and drug abuse.
add: The Hypospray High-Strength Synthesiser, containing stronger
versions of drugs to treat brute, burn, oxyloss and toxic damage.
add: The Piercing Hypospray (also applicable to the Standard and
Peacekeeper borgs) that allows a hypospray to pierce thick clothing and
hardsuits.
add: The Defibrillator, giving the medical cyborg an onboard
defibrillator.
/🆑

- [ ] Price the material cost of the boards appropriately
- [ ] Get the defib upgrade working

* Got the defib working

* Adjusted research and costing levels

* Missed a close paren
2016-12-15 10:50:13 +13:00
XDTM
7d1a67d0c8 Abductor tools and tool sound refactor. (#22125)
* Everything in the PR

* I'm taking that as a yes
2016-12-14 18:09:41 +13:00