Commit Graph

3651 Commits

Author SHA1 Message Date
oranges
910aebbec1 Revert "Reduces tool speed" (#22157) 2016-12-12 23:55:52 -05:00
Joan Lung
e37189b7e5 slowish 2016-12-11 17:56:33 -05:00
Joan Lung
f30041b9b0 Reduces tool speed 2016-12-11 17:31:38 -05:00
KorPhaeron
e74daaa50c Fixes stun batons (#22103) 2016-12-11 15:28:57 +01:00
Cheridan
2dd1a87345 Merge pull request #22083 from ChangelingRain/multiplierspeed
Refactors toolspeed to be a multiplier instead of a divisor
2016-12-10 19:22:44 -06:00
Joan Lung
e6df49f3de Revert "Removes left inhand files, automatically mirrors inhands" (#22085) 2016-12-09 18:27:25 -05: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
f06766b3bb Merge pull request #22032 from KorPhaeron/iconreflections
Removes left inhand files, automatically mirrors inhands
2016-12-10 10:27:42 +13: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
ExcessiveUseOfCobblestone
dccde22917 Customization in its prime! (#22011)
* Customization in its prime!

* GO AWAY
2016-12-09 13:20:45 +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
Kyle Spier-Swenson
dedb16826e Speeds up world init. (93s -> 49s) (#21992)
* Speeds up world init.

* Armor is now new inited for obj and the first level of subpaths.
* Actions is now lazyinited and deleted with empty.
* Actiontypes is now only inited when actually used and deleted once it pre-fills actions with the action buttons.
* Pipes now prefill their node list(s) in new() using new /list/ (count) syntax to speed up the list initaliztions and remove the init proc.
* Pipes no longer store their item version, instead creating it on the fly when deconned
* Walls no longer store their metal stacks, instead creating it on the fly when deconned.
* obj, walls, floor, plating, item, machinery, structure, pipe, pipenet, atom, and movable no longer have an (init) proc. (along with a few other smaller examples)
* Atmos can pass checking is now a var with the ability to have a proc be call in advance cases.
  * (as a side effect, I had to fix a few things that were calling atmosCanPass rather then using the pre-calculated list, this should speed up chemfoam and flame effects greatly)

* Reverts upload limit
(remind me one day to defuck this, it could easily be a config thats not editable by vv to make changes easier)

* Makes apc update icon a bit faster.
APC new is some what high on the profile of world init, still not sure why, but this stood out as a waste of cpu so i fixed it.

* Fixes runtime with atmos backpack water tanks.

* Makes smoothing faster (and fixes turfs smoothing twice at init)

* Makes apcs init faster by replacing some spawns with addtimer

* fix transit turfs.
2016-12-08 21:50:15 +13:00
KorPhaeron
ace673e829 Removes left inhand files, automatically mirrors inhands 2016-12-07 23:34:12 -06: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
ExcessiveUseOfCobblestone
b07589a933 Special SnowFood [Food Feature + Food-Related fixes] (#21935)
* Fixes Food Renaming and sorts

* wew

* Pkp + Remie Review
2016-12-06 10:35:44 +13:00
Firecage
b957fd606b Fixes bug with secondary Chaplain Null Rods not being morphable. (#21921)
* Cures multiple nullrod syndrome.

* Just .dme change
2016-12-04 21:22:46 -06:00
Joan Lung
551ede6d35 Kills all remaining text pronoun macros (#21916)
* Kills all remaining text pronoun macros

* review your own code

* oh right one further

* more

* \
2016-12-04 21:32:31 +01:00
GunHog
b283fd04e8 Advanced Mop can now make its own water (#21903)
* Advanced Mop can now make its own water

The Advanced Mop can now produce its own water at a rate of 1 unit per
process().

The advanced mop now has a switch to toggle wetting itself.

* Tweaks

Uses the proper return ..()
Rearranged the text a little.
2016-12-04 18:42:23 +01:00
oranges
c304c5f9d7 Merge pull request #21896 from Cyberboss/patch-3
Another bad addtimer
2016-12-04 23:12:57 +13:00
Mervill
3f68bd7202 Merge branch 'master' into a_intent
Conflicts:
	code/modules/mob/mob_defines.dm
2016-12-04 00:38:37 -08:00
WJohn
96c93f6b38 Merge pull request #21870 from KorPhaeron/cyborg_tools
Engineering Cyborg Tools Now Use the Default Sprites
2016-12-03 02:53:11 -05:00
Mervill
0972f78800 a_intent now uses defines 2016-12-02 22:27:30 -08: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
Jordie
ca6ffdba40 Merge pull request #21866 from Mervill/slashes_deux
Remove slash from end of type refs/defs
2016-12-03 15:56:10 +11:00
Cyberboss
7d525c9c3e And another 2016-12-02 12:56:42 -05:00
Mervill
09ea5ad2e5 w_class now uses defines 2016-12-01 21:33:14 -08:00
Joan Lung
a5ae025549 Replaces "specflags" with "species_traits" (#21851)
* Replaces "specflags" with "species_traits"

* this will do
2016-12-01 21:16:33 +13:00
KorPhaeron
f77cd58b70 Cyborg Tools 2016-12-01 00:10:27 -06:00
Mervill
01d4232570 Remove slash from end of type refs/defs 2016-11-30 19:23:15 -08:00
Mervill
b5578df27d corrects some defs without leading slash (#21843) 2016-11-30 20:05:14 +13:00
ExcessiveUseOfCobblestone
f035c1a340 Give your unique weapons some backstory! (#21816)
* Description Editing

* Fixed because i'm a dummy

* Halves the character limit for descriptions

* Lowers it even more, surely this will suffice.

* makes citrus smile

* dumb citrus

* dumb cobby

* Fixes bug where it gives empty name/desc on pressing cancel.
2016-11-30 18:53:36 +13:00
Jordie
d5bff39b71 Merge pull request #21786 from optimumtact/litanyoffailures
Fixes all remaining addtimers missed
2016-11-27 21:47:44 +11:00
Xhuis
118fca35b8 Cleanup on aisle 892 (#21745)
* Plastic explosives now delete upon suicide

* Removes some old code

* Allows resisting out of straight jackets

* Verifies roller bed dock functionality

* Fixes lava's article

* Fixes Syndicate pinpointers being stuck to one mode

* Addresses some of @phil235's concerns

* Removes the Highlander left standing message
2016-11-27 22:59:34 +13:00
oranges
af7e6d1323 Fixes all remaining addtimers missed 2016-11-27 08:31:07 +00:00
kevinz000
87dbd65811 [READY]] FLIGHTPACKS (AKA cooler, better, and technological wings with a unique gimmick!) (#20860)
* vroom

* wew

* a

* b

* morestuff

* .

* a

* .

* .

* basicsprites+extend/retract

* ...

* .

* thanks travis

* woops

* thankstravisv2

* redundence

* ishouldstopmakingsomanygoddamncommits+empdamage

* stuff

* ..

* ion_trails

* fixes_conflict_1

* fix

* compilesnow

* .

* fuck

* WIP: Multi Step Assembly

* thismightfixitthismightnot

* shoe-attachment

* noselfremoval

* wooops

* tweaksandcrashing

* runtimes

* runtimesfuntimes+crash update 1

* thisprobablywontcompile

* stillwip

* githubPLEASEWORK

* fixes conflicts 3/3

* REFACTORSUNTESTED

* fixingconflicts2

* fixingconflicts3/3

* updates

* stuffs

* ...

* stillWIP

* stufffs

* .

* ..

* runtimesfuntimes2

* stuffs2

* conflictfix

* ...

* fuck

* fix

* bah merge conflicts

* knockback_testing1

* conflictfixing...

* mergeconflicts

* plop

* socloseyetsofar

* tweaksandfixes

* conflicts

* fix

* fixes

* fix

* woops

* woops2

* hotfix

* ...

* flufftextandfixes

* test

* ..

* fix1/2

* stuff

* finallysomeoneteachesmehowtofixthisshit

* FIX

* why

* .

* bitflagsshitflags1

* bitflags-shitflags2

* bitflags-shitflags2

* bitflags_shitflags_4

* autofloating

* minerbuffgetthepun?

* notouchingfloors

* ...

* .

* f l o a t

* kek

* kek

* fixes

* fixes2

* sprites
2016-11-25 13:26:43 +13:00
oranges
3c7f7582f1 Merge pull request #21680 from KorPhaeron/lavabase2
Syndicate Lava Base Remap
2016-11-24 10:28:57 +13:00
kevinz000
a898c0b8d0 I accidently made flashbangs divide by zero. (#21687)
* Update flashbang.dm

* fix

* Update flashbang.dm
2016-11-24 10:26:29 +13:00
KorPhaeron
3c769285e4 Syndicate Lava Base Remap 2016-11-21 20:37:05 -06:00
Jordie
8beebf7aba Merge pull request #21634 from Crushtoe/sprite-and-desc
Adds and Fixes Sprites, Tweaks Null Rod Descriptions
2016-11-22 09:15:01 +11:00
oranges
6c1966d393 Merge pull request #21612 from KorPhaeron/ssreligion
Ssreligion
2016-11-20 14:54:12 +13:00
Crushtoe
3bfacd6771 Tweaks various item descriptions
- The USA bedsheet sprite now properly displays.
- Tweaked some null rod descriptions.
- Added some tips.
- Added black bedsheet sprite to neck.
2016-11-18 22:17:33 -06:00
Crushtoe
e1d3e42254 Tweaking descriptions.
Tweaks some holy weapon descriptions.
2016-11-18 20:20:19 -06:00
oranges
1c87147b3d Merge pull request #21575 from Crushtoe/master
Adds new icon for the null rod's reaper's scythe variant.
2016-11-19 13:42:18 +13:00
Joan Lung
7c25b959de Refactors robot modules (#21572)
* Refactors robot modules

* no message

* ok

* mini why

* this is what you wanted, right?

* try to remember

* I can't code

* a good coder

* whirring

* bleh

* less sounds

* math is for nerds

* now it will
2016-11-18 23:12:32 +01:00
Cheridan
9c967840eb Merge pull request #21590 from Cyberboss/ChangeTheGoddamnValues
Fixes metal duplication when using an RCD to make high security airlocks
2016-11-18 05:47:52 -06:00
KorPhaeron
969abebade Adds a religion subsystem 2016-11-17 21:01:22 -06:00
Joan Lung
f162d4d84a Refactors scripture quickbind (#21563)
* Refactors scripture quickbind

* =
2016-11-17 12:28:57 +13:00
Cyberboss
800327bb51 Fixes #21582 2016-11-16 18:03:29 -05:00