Commit Graph

37945 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
988481354e Merge pull request #29864 2017-08-13 02:18:40 -04:00
Cyberboss
3981166635 Merge pull request #29861 2017-08-13 02:18:28 -04:00
Cyberboss
5e50f8e627 Merge pull request #29858 2017-08-13 02:18:16 -04:00
Cyberboss
251e12a00c Merge pull request #29853 2017-08-13 02:17:43 -04:00
Cyberboss
5e2bf2b4f9 Merge pull request #29849 2017-08-13 02:17:28 -04:00
Cyberboss
3ac1c33fec Merge pull request #29843 2017-08-13 02:17:15 -04:00
Cyberboss
80bd5e3a7f Merge pull request #29840 2017-08-13 02:16:27 -04:00
Cyberboss
38289035d8 Merge pull request #29794 2017-08-13 02:16:14 -04:00
Cyberboss
0c632203c1 Merge pull request #29816 2017-08-13 02:15:58 -04:00
Cyberboss
0b4410cfcf Merge pull request #29826 2017-08-13 02:15:45 -04:00
shizcalev
a2e09babd1 Fixed Nanotrasen sign description 2017-08-12 13:34:42 -04:00
shizcalev
da70c2f851 Baseturf helper update 2017-08-12 13:27:27 -04:00
Xhuis
da80f72dde throw it at him, not me! 2017-08-12 02:11:51 -04:00
Xhuis
a57adb7b49 Fixes minebots missing action icons 2017-08-12 02:09:43 -04:00
pubby
1b7797e690 Fix cracked fireaxe cabinet 2017-08-11 16:34:04 -05:00
Kyle Spier-Swenson
c2d73dcc46 Remove debug 2017-08-11 13:54:56 -07:00
Leo
2b0e6128b8 Changes the check to prevent any possible href spoofing 2017-08-11 17:31:03 -03: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
Jordan Brown
299137edd3 Fixes bad dirs (#29815) 2017-08-11 16:53:01 -03:00
Leo
4d66935a10 Fixes vending machines being empty (#29823) 2017-08-11 16:52:44 -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
Jordan Brown
a10a7e6016 Ports weapons to Initialize() (#29803) 2017-08-11 09:49:08 +02:00
Jordan Brown
e5f1960525 Fixes help text for embedded objects (#29799) 2017-08-11 09:46:37 +02:00
kevinz000
b9ab67b219 Update emote.dm 2017-08-11 00:11:37 -07:00
Kyle Spier-Swenson
77e29526db Adds callback select system
This system lets you run a group of callbacks asynchronously, returning once all of them finish, without having to wait for each callback to finish before running the next one.

I made it in my bicon pr, but i don't need it anymore, so i removed it from there and put it here.
2017-08-10 13:47:14 -07: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
Leo
fedccea519 Merge pull request #29800 from MrStonedOne/betterlogaccess
Massively improves downloading/viewing logs.
2017-08-10 12:49:02 -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
pubby
4a6dac1f5e Updates PubbyStation (#29795)
Noteworthy changes:

move bar to where theater stage was (theater stage is kill)
expand kitchen into old bar area
add curator wing + curator job to monastery
enlarge chapel because curator wing too big
make foods not have random pixel_x/pixel_y at map load
Forgettable changes:

add augment manipulator to robotics
add toolbelts to tool storage
add crew monitor to brig
add droppers to chem
replace art storage wire with artistic toolboxes
add restroom sprites
improves floor decoration
recolor badly colored exp. lab pipe
correct misplaced pressure dial at incinerator
fix incorrect morgue access
fix stacked transit tubes
add workout machines to brig
add cable layer to engineering
change dorms slightly
replace gaudy SS13 sign with gaudy Nanotrasen sign
add SS13 floor sign
chapel now has bees
2017-08-10 08:18:55 -03:00
ShizCalev
922422a159 Window Spawners mk2 (#29792) 2017-08-10 08:17:30 -03:00
Xhuis
8c2c317602 Returns neck slots in get_head_slots 2017-08-10 02:18:06 -04:00
kevinz000
aef7b9d3ec Update helpers.dm 2017-08-09 15:14:55 -07:00
Jordan Brown
9f9b2d2e89 Merge pull request #29784 from ShizCalev/Debug-output-tweak
Refined Test Areas (Station Z) debug output
2017-08-09 15:18:29 -04: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
5cbd818d1a Addresses the review 2017-08-09 11:10:48 -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
MrStonedOne
974151330a Massively improves downloading/viewing logs.
Now admins can view logs in a browse() window, attempt a run() (this can be buggy), or download it like before.
2017-08-09 02:25:48 -07:00
Ashe Higgs
836e1ae9ea Fixes swarmer shells having no ghost notifications (#29781)
* Swarmer shells now have ghost notifications again

* oh and this
2017-08-09 10:25:37 +02:00
Jordan Brown
6475d361cf Clock powerdrain now works on any device with a powercell (#29632)
* Clock powerdrain now works on any device with a powercell

* stock_pars -> stock_parts

* Make it not work on guns

* Batons too
2017-08-09 10:05:24 +02:00
Leo
a2826d782b Merge branch 'master' into lzimann-pings 2017-08-09 00:29:49 -03:00
Jordan Brown
d1ae0a0c95 Adds helpers to avoid << use (#29611) 2017-08-09 00:27:54 -03:00
Leo
faf6c60caa Merge pull request #29753 from tgstation/Cyberboss-patch-4
Makes dummy humans queue instead of harddel
2017-08-09 00:25:06 -03:00
Leo
a334615e97 Merge pull request #29779 from ChangelingRain/crusherfix
Fixes the Hierophant not spawning its crusher trophy
2017-08-09 00:23:30 -03:00
Leo
1336316e3c Removes chat pings from href logs 2017-08-09 00:18:20 -03:00