Commit Graph

6354 Commits

Author SHA1 Message Date
Kyle Spier-Swenson f2cf4c2f5c [ready]Makes bIcon better (#29690)
Goonchat will use the asset cache, you now have to specify who to send the icons too.

Goonchat will now load icons in the background, displaying them once they load. this prevents the message from being delayed while the icons are sent.

Icons that aren't preloaded using the asset cache system will not render on ie8 clients. This is because of a ie8 bug that prevents changes on runtime created images from rendering.
2017-08-14 10:40:50 +12:00
Cyberboss 80bd5e3a7f Merge pull request #29840 2017-08-13 02:16:27 -04:00
Xhuis 210f03723e Fixes Syndicate cyborg esword icons 2017-08-13 00:48:33 -04:00
MoreRobustThanYou 1ee360f228 His Grace now shows up on the orbit list (#29819)
* His Grace now shows up on the orbit list

* .

* Update his_grace.dm
2017-08-11 17:08:38 -03:00
ShizCalev 2d133d3668 Fixed inhand for cable cuffs (#29811) 2017-08-11 09:51:46 +02:00
FrozenGuy5 026d4ed8da initialize() (#29807) 2017-08-11 09:50:00 +02:00
Jordan Brown e71ae59245 Ports weaponry to Initialize (#29804) 2017-08-11 09:49:30 +02:00
kingofkosmos 10c5366f4a Compacted the used-check. Corrected whetstone-warning-spans. 2017-08-10 23:03:12 +03:00
kingofkosmos ac218908cd Adds icon_states to the unused and used Eldritch whetstones. 2017-08-10 22:48:40 +03:00
FrozenGuy5 4b4cd5e416 decapitalizes flyswatter in weaponry.dm (#29805)
* spelling

* initalize supermatter sword

* is this how you revert a commit hurrdurr
2017-08-10 08:08:56 -05:00
Jordan Brown df94d4b189 Merge pull request #29747 from lzimann/machinerycopypasta
Removes a great amount of machinery copypasta with circuitboards.
2017-08-09 15:14:16 -04:00
Lzimann b967520144 Fixes dme issues. Also renamed _circuitboard.dm to circuitboard.dm 2017-08-09 13:44:23 -03:00
Lzimann 58d0f12c5c Removes a great amount of machinery copypasta with circuitboards.
Also changes New -> Initialize in most of them.
renamed: `code/game/machinery/computer/computer.dm` -> `code/game/machinery/computer/_computer.dm`
renamed: `code/game/machinery/machinery.dm` -> `code/game/machinery/_machinery.dm`
Moved all circuitboards to a new folder at `code/game/objects/items/weapons/circuitboards`
2017-08-09 11:10:48 -03:00
Jordan Brown 3c56d0f4f3 Ports duplicated slipping code to a component (#29628)
* Ports duplicated slipping code to a component

* Makes metal not slippery

* asdf

* Instead of cherry picking like an idiot I could just copy paster

* OOP

* And blood, don't forget Fry's blood!

* Further fixes

* A more generic fashion

* Use the new system

* Fixes

* Fix cartridge type

* Remove inertia
2017-08-09 16:06:15 +02:00
octareenroon91 a926a43767 Fix RCL loading (#29773) 2017-08-08 16:58:13 -03:00
shizcalev 22764665c9 CentCom Standardization 2017-08-07 19:04:27 -04:00
Cyberboss a2dc6e2c5a Merge pull request #29724 2017-08-06 18:58:26 -04:00
Firecage f65786a8cf The inhands of the Dark Blessing chaplain weapon is now visible. (#29727) 2017-08-05 11:02:21 -03:00
FrozenGuy5 552b851445 Update light.dm 2017-08-05 01:45:27 +01:00
Cyberboss fc0a102753 Merge pull request #29693 2017-08-04 10:21:07 -04:00
oranges 6b6fc91172 Merge pull request #29623 from Cyberboss/TiredOfBS
Removes all checks for subsystem existence
2017-08-04 23:54:47 +12:00
Lzimann 97199dd8b0 Gives an initialize hint to stacks, boxes, closets and bots 2017-08-03 15:30:00 -03:00
Jordan Brown 6806607425 Merge pull request #29369 2017-08-02 09:45:05 -04:00
Jordan Brown d3a4468ede Fixes devil pitchforks being uninitialized (#29610) 2017-08-01 17:57:15 -05:00
Jordan Brown 6175ab77d5 Removes all checks for subsystem existence 2017-08-01 10:16:37 -04:00
Jordan Brown 6df66f730f Merge pull request #29617 2017-08-01 09:40:33 -04:00
shizcalev 99624b8e74 further spellchecking 2017-07-31 23:09:08 -04:00
MoreRobustThanYou d4966faf23 removes ERP material 2017-07-31 21:48:50 -04:00
Cyberboss 8032eeab74 Merge pull request #29558 2017-07-29 20:41:00 -04:00
ShizCalev d525b18d8d Completes major inhand split project (#29574)
* Completes split project

* More work on it. Should be more or less finished
2017-07-29 16:47:37 -03:00
Unknown 2efdc78681 this fixes the PR 2017-07-29 03:52:55 +02:00
Qustinnus 7ecbb8a1b2 Merge branch 'master' into disgustport 2017-07-29 03:06:25 +02:00
octareenroon91 fb314c525b Give c4 correct plastic_overlay
Fixes #19270
2017-07-28 15:46:49 -05:00
MoreRobustThanYou 899bb2a305 Ports Rapid Cable Layers from /vg/ and paradise (#29119)
Add's a tool that lays cable as you walk , speeding up cable construction

add: Nanotrasen has begun production of the Rapid Cable Layer, a tool that helps you lay down cables faster
add: You can now craft ghetto RCLs with metal, a screwdriver, welder, and wrench. They hold less cable, and may fall apart or jam!
2017-07-28 09:58:40 +12:00
Jordan Brown 12620b6bb3 Merge pull request #29518 2017-07-27 09:45:47 -04:00
Jordan Brown f4e1be467c Merge pull request #29502 2017-07-27 09:43:16 -04:00
BeeSting12 ef251fc3a7 might be better to use total worth instead 2017-07-26 14:37:48 -04:00
BeeSting12 0fb80e97b3 fixes a couple issues 2017-07-26 14:38:44 -04:00
shizcalev 8ebf6b6a43 cleaned up paper 2017-07-26 05:35:05 -04:00
oranges b44bb6ffad Revert "Adds the hivebot invasion event (#28514)"
This reverts commit 78a2e5c4c3.
2017-07-25 23:06:38 +00:00
oranges ab940008b8 Merge pull request #29454 from ShizCalev/nanotrasen
Standardized the corporate name
2017-07-25 09:34:20 +12:00
Ashe Higgs a5e7d63cb2 Unborks supermatter theft (#29432) 2017-07-24 09:51:04 +02:00
oranges 90689ebba1 Merge pull request #29163 from Tacolizard/jim_E_Rustle
Prevents the captain's sabre from rustling jimmies
2017-07-24 11:12:42 +12:00
oranges 63c5f67dd1 Merge pull request #29431 from Xhuis/sorry_about_that_ii_screwed_it_up
Nuke screwdrivers are no longer randomly colored
2017-07-24 10:35:43 +12:00
shizcalev f31cbb3ac5 Nanotrasen 2017-07-23 04:08:57 -04:00
Xhuis a5f4e6c124 Nuke screwdrivers are no longer randomly colored 2017-07-21 21:16:54 -04:00
kevinz000 9123f45eab Fixes harmonicas acting like muzzles (and runtiming instead of properly muting you too.) (#29393) 2017-07-21 20:25:19 -03:00
Leo e677813a93 Merge pull request #29401 from Xhuis/satchel_fix
Ore satchels no longer have infinite capacity
2017-07-21 20:20:41 -03:00
Joan Lung 01d9da3da4 Fixes a drone ping issue 2017-07-20 18:16:18 -04:00
Xhuis a3178652d6 Ore satchels no longer have infinite capacity 2017-07-20 12:37:26 -04:00