Commit Graph

23844 Commits

Author SHA1 Message Date
John Ginnane a480f74d03 Newly crafted stacks are merged with held stacks of the same type (#33971)
* Merge newly crafted stacks with held stacks

* Update code
2018-01-07 21:27:53 -05:00
Jordan Brown 9783a59244 Merge pull request #34129 from MrDoomBringer/eminem
Adds package wrapping to autolathes
2018-01-07 18:06:41 -08:00
Jordan Brown 77233b6d48 Merge pull request #34118 from MrStonedOne/patch-459
Reduces the memory footprint of the gas_mixture datum
2018-01-07 17:58:22 -08:00
Jordan Brown 6b84475000 Fixes uplink_purchase_log GC error (#34119)
* Fixes uplink_purchase_log GC error

* Add missing GLOB.
2018-01-07 19:51:15 -05:00
kevinz000 46022c8479 Buckling now moves post-buckling instead of pre on vehicles (#34150) 2018-01-07 19:49:29 -05:00
MoreRobustThanYou ed0195be4f Chemisty recipe macros (#34149)
* Chemistry recipe macros

* Fix energy not being drained

* reee tgui travis

* Finishing touches
2018-01-07 19:48:55 -05:00
ShizCalev ea03a34ef1 Corrects runtime when shooting humans 2018-01-07 14:19:32 -05:00
ShizCalev 92b905b067 Fixes fully_heal not curing disabilities 2018-01-07 14:18:52 -05:00
ShizCalev c4496dbd72 Consolidates bot assemblies under one parent 2018-01-07 13:43:46 -05:00
Leo d827333329 Merge pull request #34127 from tgstation/Cyberboss-patch-7
Removes the weird timer shennaigans from exp tracking
2018-01-07 15:05:52 -02:00
Leo e1e10ca6f4 Merge pull request #34140 from kevinz000/quickfix-1
Fixes armor penetration not working on objects and therefore mechs
2018-01-07 15:02:30 -02:00
ShizCalev 18892a0dc5 Corrects inconsistent usage of 310.055, 310.15, & 310 as body temp (#34134) 2018-01-07 15:01:26 -02:00
modularized_suicide 366418f777 many flashes?? 2018-01-07 02:06:58 -06:00
deathride58 77190c097b Allows equipping an outfit during rudimentary human transform 2018-01-06 15:07:13 -05:00
Leo a6da8a2859 Merge pull request #34107 from ShizCalev/canister-sprite
Fixes relabeled canisters reverting sprites when broken
2018-01-06 11:32:25 -02:00
Jordie 7c2d7c9b70 Adds ban option for team antags (#34116)
* adds ban option for team antags

* conversion antags ban button
2018-01-06 11:29:55 -02:00
kevinz000 f7f5457ac2 Object Armor Penetration 2018-01-06 02:23:43 -08:00
modularized_suicide 2b84126707 maxstack 2018-01-05 16:47:53 -05:00
modularized_suicide 74c95ad6ae dont get all wrapped up in this pr 2018-01-05 16:29:56 -05:00
Jordan Brown 4a07ae1f7c Removes the weird timer shennaigans from exp tracking 2018-01-05 15:36:56 -05:00
ShizCalev 9112f0c005 Made emagged bots /slightly/ more aggressive. 2018-01-05 14:58:22 -05:00
MMMiracles 5b9eeb8935 Adds adorning spears with heads (#33955)
* get spiked, son

* bonespear variant

* cyberboss changes + pixel shifting

* Move 👏 overlay 👏 calls 👏 to 👏 update 👏 icon

* git yer head on a pike here, 25 cents

* ignore that .gitignore

* variable change

* changes n stuff

* may of forgotten that bit

* moved vars up + drop_location()

* null the nulls
2018-01-05 08:48:07 -08:00
Jordan Brown 77b693ba2d Merge pull request #33992 from ninjanomnom/f1-ahelp
fixes f1 ahelp
2018-01-05 07:12:52 -08:00
Kyle Spier-Swenson b715be8d41 Reduces the memory footprint of the gas_mixture datum
To save memory, byond only stores vars that are written to, referring to the original compile time value stored once for each type, otherwise.

Originally we set defaults in New() to control the order of the vars in this changed vars list to optimize access speed, but this no longer makes sense to do because byond moved that from a linked list to a binary insertion sorted vector.

And making the volume default to the most popular case, and only get written too otherwise should be a noticeable memory improvement.
2018-01-05 04:44:32 -08:00
ShizCalev 6a14af352f grammars circuits (#33974) 2018-01-05 07:06:37 -05:00
Shadowlight213 a22fd935d6 Fixes infernal jaunt causing devils to get stuck if interrupted (#34056)
* Fixes infernal jaunt causing devils to get stuck if stunned.

* defines because I know a maintainer will yell at me for this.
2018-01-05 07:04:38 -05:00
Tad Hardesty da61b257ff Show the correct coordinates when a pulse rifle prize is found (#34089) 2018-01-05 07:02:04 -05:00
Cruix 3c45b8ff0e Removed some superfluous stack code (#34083) 2018-01-05 06:59:28 -05:00
oranges 59ea794c20 Fix bug with smashing bottles on throw (#34077)
The passed in variable is a datum, not a mob

Corrects the description for another instance of this
2018-01-05 06:57:52 -05:00
Tad Hardesty cad0922daf Fix away missions taking 2+ minutes to load (#34084) 2018-01-05 06:56:55 -05:00
Tad Hardesty 629c674b8e Fix drone shells runtiming if no holidays are active (#34085) 2018-01-05 06:55:14 -05:00
ShizCalev 3f8f44ff4c medbot tweak 2018-01-05 04:31:40 -05:00
Armhulen 73723e4529 thank fuck 2018-01-04 22:04:38 -08:00
ShizCalev 625414e9f5 Fixes relabeled canisters reverting sprites 2018-01-04 22:43:26 -05:00
ShizCalev 8c78dc5d3a Fixes white power cables in DM (#34066) 2018-01-04 21:16:33 -05:00
oranges 4bb837ca75 Merge pull request #34025 from DaxDupont/PDAColor
PDA Interface color is now a preference.
2018-01-04 16:11:57 +13:00
Leo ff9771e473 Merge pull request #34026 from ShizCalev/jaunt-fixes
Fixes mobs getting dusted by SM & Tesloose while jaunting
2018-01-03 22:50:14 -02:00
Jordan Brown 5f4eba15d7 Fixes #33522 2018-01-03 16:33:46 -06:00
Dax Dupont be4cd97363 Fixes the paper mache wizard robe 2018-01-03 16:29:27 -06:00
ninjanomnom a347ec2837 fixes f1 ahelp 2018-01-03 16:30:27 -05:00
vuonojenmustaturska 67051f37c8 You can taste oil (#34046) 2018-01-03 16:05:43 -05:00
Leo 5106a8bc93 Merge pull request #34033 from AutomaticFrenzy/patch/mime-laugh
Fix mimes being able to laugh audibly
2018-01-03 11:35:38 -02:00
Leo d1440be403 Merge pull request #34038 from ShizCalev/text-pad
Fixes text pad window title
2018-01-03 11:33:57 -02:00
ShizCalev 4348fd7672 Fixes observers not being transfered to new mobs (#34039) 2018-01-03 11:33:20 -02:00
Dax Dupont 5324ca88bc Unsquishes job ban panel 2018-01-02 20:10:06 -06:00
Emmett Gaines 830929669d makes the decal component handle updating inventory icons (#33967) 2018-01-02 16:17:39 -05:00
XDTM b85776f36d Fixes Abyssal Gaze (#34003) 2018-01-02 15:22:09 +01:00
Dax Dupont 7fec1627f7 Solar control fixes (#33985)
* Solar fixes

* Also removing the solcon-o icon
2018-01-02 15:20:04 +01:00
ShizCalev 5c506a9a1b Fixes text pad window title 2018-01-01 21:47:26 -05:00
Tad Hardesty d1340ca4db Fix mimes being able to laugh audibly 2018-01-01 16:58:42 -08:00