Commit Graph

22290 Commits

Author SHA1 Message Date
shizcalev 2a5df54e7c moved can_trigger_gun to weapon parent 2017-08-14 13:30:20 -04:00
Jordan Brown dce49b6caf Adds defines for mouse_opacity 2017-08-14 11:18:22 -04:00
Leo 6b8a379d53 Merge pull request #29841 from tgstation/Cyberboss-patch-2
Makes the ahelp topic give the permissions warning
2017-08-14 08:54:07 -03:00
Kyle Spier-Swenson 2faec70007 Fix compile warning 2017-08-14 00:58:15 -07:00
oranges ff6219811b Merge pull request #29885 from MrStonedOne/mso_is_chief_sanitation_technician_now
[s] Clean up some inputs
2017-08-14 19:44:05 +12:00
kingofkosmos 58377a4637 Tweaks atmos canister lights. (#29867)
* Makes canisters have no flashing red light when empty.

* Removed two unnecessary lines.
2017-08-14 18:24:10 +12:00
MrStonedOne d7a507d412 Clean up some inputs 2017-08-13 22:29:58 -07:00
shizcalev bfa0ab7234 Freon singuloth fix 2017-08-13 23:16:30 -04:00
oranges 8bdf21db5f Merge pull request #29829 from Cyberboss/MergeEntered
Merges the two turf/Entereds
2017-08-14 11:00:36 +12:00
Joan Lung 6cacf125e5 Ports a slightly edited version of Eris APC sprites (#29809) 2017-08-14 10:53:35 +12:00
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 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 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 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
Leo 2b0e6128b8 Changes the check to prevent any possible href spoofing 2017-08-11 17:31:03 -03:00
kevinz000 b9ab67b219 Update emote.dm 2017-08-11 00:11:37 -07:00
Jordan Brown f377a14f1c Makes the ahelp topic give the permissions warning 2017-08-10 15:55:40 -04:00
Leo fedccea519 Merge pull request #29800 from MrStonedOne/betterlogaccess
Massively improves downloading/viewing logs.
2017-08-10 12:49:02 -03:00
Jordan Brown a7be74fec8 Merges the two turf/Entereds 2017-08-10 09:59:23 -04: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
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 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
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
Jordan Brown 88a6d081d7 Merge pull request #29775 2017-08-08 15:58:50 -04:00
shizcalev c75360b624 Refined Station Z test area verb output 2017-08-08 13:33:57 -04:00
Jordan Brown 5c696a582d Merge pull request #29756 2017-08-08 09:59:07 -04:00
Jordan Brown 16592d8472 Merge pull request #29768 2017-08-08 09:58:56 -04:00
Jordan Brown 20921b45d4 Merge pull request #29769 2017-08-08 09:58:52 -04:00
oranges a177f412fd Merge pull request #29748 from ShizCalev/debug-tweak
Adds a Test Areas (Station Z) verb
2017-08-08 22:50:19 +12:00
JStheguy c1e1662c86 gives laptops actual sm monitoring sprites (#29712)
🆑 JStheguy
imageadd: Laptops now have actual sprites for using the supermatter monitoring instead of defaulting to a generic one.
/🆑

It still counts as a sprite change if the code changes were only in service to the sprite change, right?
2017-08-08 22:49:04 +12:00
Joan Lung 5475339028 Fixes the Hierophant not spawning its crusher trophy 2017-08-07 22:33:46 -04:00
shizcalev 55632c9171 Missed a couple 2017-08-07 19:27:50 -04:00
shizcalev 22764665c9 CentCom Standardization 2017-08-07 19:04:27 -04:00
shizcalev 7715f9497e Have you heard the story of the rogue drone? 2017-08-07 18:44:52 -04:00