Commit Graph

935 Commits

Author SHA1 Message Date
Kyle Spier-Swenson 12570805bd Closes the Pool. (#23150)
* Delete pool.dm

* Removes usage of PoolOrNew

* Wrap up
2017-01-22 16:00:23 -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 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
XDTM 397f440e10 Fixes pockets 2017-01-04 15:18:16 +01: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
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
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
Joan Lung 43ce2667f4 Merge branch 'master' of https://github.com/tgstation/tgstation into multiplierspeed 2016-12-09 18:03:43 -05:00
Joan Lung a3be7a9226 Refactors toolspeed to be a multiplier instead of a divisor 2016-12-09 16:55:51 -05:00
oranges 54988003e5 Merge pull request #22036 from Mervill/stale_comments_2
These comments where removed by me.exe, just now
2016-12-09 14:22:53 +13:00
oranges 037aed94f7 Merge pull request #22022 from XDTM/StoRage
Fixes deleting items in storages not updating the HUD
2016-12-09 13:19:32 +13:00
Mervill 417c50efa2 These comments where removed by me.exe, just now 2016-12-08 01:48:46 -08:00
XDTM 118849dac3 This was it. This is all i needed to do and it took me more than 4 hours to find it. Fuck me.
Also thanks to Remie for pointing me in the right direction.
2016-12-08 01:29:35 +01:00
Mervill c2e2440953 Merge branch 'master' into w_class
Conflicts:
	code/game/objects/items/weapons/twohanded.dm
2016-12-02 21:44:24 -08:00
Mervill 09ea5ad2e5 w_class now uses defines 2016-12-01 21:33:14 -08:00
Mervill 01d4232570 Remove slash from end of type refs/defs 2016-11-30 19:23:15 -08:00
KorPhaeron 969abebade Adds a religion subsystem 2016-11-17 21:01:22 -06:00
oranges fed780fa9b Merge pull request #21540 from Supermichael777/revert-21014-atmosgrenades
Revert "Atmos Grenades"
2016-11-15 16:40:35 +13:00
Supermichael777 5d9bc48034 Revert "Atmos Grenades" 2016-11-13 19:44:29 -05:00
Cyberboss 0ff7c62984 Removes duplicate fingerprinting 2016-11-13 19:09:47 -05:00
Cyberboss 316070be13 Wooweee feeling rustled today 2016-11-13 12:07:04 -05:00
Cheridan 373604639d Merge pull request #21439 from Aloraydrel/CE_BELT
Adds an analyzer to the CE's belt
2016-11-10 12:21:56 -06:00
Mervill 9ea955b85f Lint (#21393)
* icon, icon_state defined twice

* desc defined twice

* desc defined twice

* desc, icon_state defined twice

* icon_state, name defined twice

* item_state defined twice

* gender defined twice

* stop_automated_movement_when_pulled defined twice

* attacktext defined twice

* speak_emote defined twice

* flying defined twice

* item_state defined twice

* speak_chance defined twice

* attack_sound defined twice (x2)

* icon_state, item_state defined twice

* icon_state defined twice

* Revert "desc defined twice"

This reverts commit 18d74f442441078a7d8e8cfaddbef1c4646b6bb9.

* desc defined twice

* Revert "desc defined twice"

This reverts commit e167c0812c94a96dfb3f6888c77cee868cc37c03.

* desc defined twice
2016-11-08 13:55:30 +13:00
Aloraydrel c30f34ad90 Analyzer to the CE belt 2016-11-07 08:00:54 -05:00
phil235 b7efc2cef4 Make energy guns able to use burst fire. (#21005)
* Make energy guns able to use burst fire.

* Changed obj/item/weapon/gun/projectile to /gun/ballistic and the name of the folder from "projectile" to "ballistic" to avoid confusion between actually projectiles and guns.

Syringe gun, energy guns and magic guns can now use burst fire.

* fixing merge conflict shit

* fixing map conflicts

* more map conflict fix

* two tiny fixes.

* tiny tweak

* fixing merge conflicts.
Moving the practice mini egun to the gun module.
Renamed nuclear.dm to energy_gun.dm

* map conflict fixes
2016-11-02 16:16:21 +13:00
Joan Lung ee76078d16 Merge pull request #21060 from phil235/Color_washing
Adding var/list/atom_colours to /atom .
2016-10-31 21:12:29 -04:00
phil235 2dc956bea0 Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing
# Conflicts:
#	code/game/gamemodes/clock_cult/clock_scripture.dm
#	code/game/gamemodes/clock_cult/clock_structures.dm
2016-10-31 19:59:00 +01:00
kevinz000 7e364fd79a rip 2016-10-29 20:45:23 -07:00
Joan Lung f8ca3860ca Merge pull request #21207 from Niknakflak/finally_getting_to_this
Toys toys toys toys
2016-10-28 15:40:50 -04:00
NikNakFlak 2428844574 Does the thing 2016-10-28 12:33:36 -07:00
kevinz000 bbeaffe9c5 Hardlight Bows (#20944)
Adds hardlight bows and hardlight quivers.
Does 12 brute and 18 burn on hit.
The quivers regenerate one arrow every few seconds and is worn on the back.
Arrows disintegrate on hit and are destroyed after 20 seconds if it is dropped to prevent spam.

ADDED TO UPLINK AT 7 TELECRYSTALS FOR A BOW AND QUIVER. Can be included in surplus crates.
🆑
2016-10-28 14:16:16 +13:00
NikNakFlak 16ee02c916 Toys toys toys toys 2016-10-26 15:25:28 -07:00
chowdermcarthor c7e474ccae Neck Slots (#21169)
* Added in a neckslot. Moved some tie items over to said neckslot.

* Changng some stuff to fix the new neckslot items.

* no message

* Altered comment to say that the old tie system is being kept as-is due to armbands and such instead of just avoiding conflicts.

* no message

* Changed the number for this.

* Fixed jaws of life not having a category, thus they only would show up when searched.
2016-10-26 19:03:41 +13:00
Cheridan ddb4bad29f Merge pull request #21132 from CyberbossJHCB/SanitizeSafe
Secure storage href sanitization
2016-10-23 22:39:55 -05:00
uraniummeltdown 1635017bb2 Atmos Grenades (#21014)
* adds atmos grenades to game and uplink

* added freon grenade, price is now 12 TC, made var for contents

* price is now 11 TC

* fixes knockout desc
2016-10-24 00:15:51 +13:00
Cyberboss 058d1f834f Fixes #20452 2016-10-22 10:28:28 -04:00
Joan Lung 7f08e9c901 Merge pull request #21056 from Tacolizard/patch-7
Adds medals to the captains lockbox
2016-10-19 18:48:34 -04:00
Cheridan 7f6f300587 Merge pull request #21036 from phil235/hugbox
Some nerfs to clothes & item damage
2016-10-19 12:15:35 -05:00
phil235 029bc65b93 Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing
# Conflicts:
#	code/game/atoms.dm
#	code/game/gamemodes/nuclear/nuclearbomb.dm
2016-10-19 01:56:02 +02:00
phil235 240f3a4c49 Adding var/list/atom_colours to /atom .
The var will be used to store the various coloring that happen for the atom so that we can separate paint coloring from color that must be inherent to the atom (an initial color for example), or from certain coloring effect like revenant's blight, mob electrocution's black color, admin edit of the color var, green color from holding the greentext item, etc.
The list has four elements, used for four categories:
ADMIN_COLOUR_PRIORITY for admin varedits and very rate color effect like holding the greentext item (and other effects that should prime over any other potential source of coloring even temporary effects).
TEMPORARY_COLOUR_PRIORITY for short color effects like revenant blight on mob, mob electrocution making you all black for a couple seconds, effects that should be appearing above paint coloring.
WASHABLE_COLOUR_PRIORITY for pretty much all paint coloring like colorful reagent on mobs, coloring turfs with paint, etc.
FIXED_COLOUR_PRIORITY for color inherent to the atom, like a blob's color, any object with a color value given in its definition.

Fixes electocution animation on mob not making the mob all black (with the skeleton overlay blinking over it)
Spray cleaner and soap can now wash paint off mobs, turfs and objects.
2016-10-19 01:51:30 +02:00
Tacolizard fbe45570a9 Update lockbox.dm 2016-10-18 13:07:22 -07:00
MrPerson 5047dd7145 Plane master handling + new chemical Rotatium (#20707)
* Plane master handling + new chemical Rotatium

A whole system to create, store, and access screen master objects from the hud. In case anybody actually wants to do anything relevant with them. Which will probably be me but whatever.

Moves things out to some planes that make sense.
click catcher -99
game 0
lighting 15
fullscreen 18
HUD 19
above HUD 20

Rotatium is more of a demonstration than something I really really love, but it is kinda neat so here you go. It rocks the game plane and lighting planes back and forth and also does light toxin damage. The longer it effects you, the stronger the rocking gets.

No pictures right now, I'll get some later. Sorry.

* Pay no attention to the commit behind the curtain

* Updates travis to 1346, the stable version for 510 for linux
2016-10-18 11:41:23 +02:00
Joan Lung 4cddd81120 Suicide now uses the pronoun helpers (#20973)
* This doesn't actually matter, because you're dead forever once it happens...

* is this entire pr chaff for something else

* you'll do it? nah, fuck that I'll do it
2016-10-18 14:36:38 +13:00
phil235 30ca862473 Fixes hardsuit not having 300hp (I gave it to the helmet, but had forgotten about the suit itself)
All unique traitor steal objective item are now immune to all damage except severity=1 explosion.
Mobs on fire no longer get damage to their worn backpacks, belts, id, pocket stuff, and suit storage.
All backpacks are now nonflammable, and bag oh holding and engineer backpack are now fireproof.
Mob receiving melee attacks now only have its outer layer of clothes damaged, e.g. no damage to jumpsuit when wearing a suit.
Made all hyposprays (not just the CMO's) acid proof.
Made the singularity gen and tesla gen immune to fire.
2016-10-17 22:51:57 +02:00
Shadowlight213 18709e5ad7 Revert "Makes drag/drop that dont have any use call click" 2016-10-16 12:41:42 -07:00