Commit Graph
10054 Commits
Author SHA1 Message Date
orangesandGitHub 0bfe9b0de9 Merge pull request #29937 from ShizCalev/turret-fix
[s] Fixes MG turret firing while the user is stunned/cuffed/unconscious
2017-08-17 10:49:24 +12:00
orangesandGitHub b11b33bdac Merge pull request #29954 from Cyberboss/RemoveItemCrafting
Fixes weaponcrafting repath
2017-08-17 10:46:34 +12:00
ShizCalevandJordan Brown 24811251a7 Fixed mop inhand, adds new inhand for the advanced mop (#29910)
* inhands

* adds inhand, fixes other inhands
2017-08-16 14:08:18 -04:00
Jordan Brown fab63821f5 Fixes weaponcrafting repath 2017-08-16 12:15:08 -04:00
Jordan BrownandLeo af4d9a85c9 Repaths /obj/item/weapon to /obj/item (#29929) 2017-08-16 10:38:51 -03:00
shizcalev e61381cba6 Fixes MG exploit 2017-08-15 17:51:12 -04:00
LeoandGitHub 5fafb4befe Merge pull request #29889 from Cyberboss/MouseOpacityDefines
Adds defines for mouse_opacity
2017-08-15 13:01:28 -03:00
Jordan BrownandLeo d144c88fb5 Annihilates the colons! (#29812) 2017-08-15 12:49:35 -03:00
Jordan Brown f0f456e8c3 Merge pull request #29854 2017-08-14 17:00:16 -04:00
Jordan Brown 87ea31f5b5 Merge pull request #29871 2017-08-14 17:00:10 -04:00
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
Kyle Spier-Swensonandoranges 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 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 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
shizcalev a2e09babd1 Fixed Nanotrasen sign description 2017-08-12 13:34:42 -04:00
pubby 1b7797e690 Fix cracked fireaxe cabinet 2017-08-11 16:34:04 -05:00
MoreRobustThanYouandKorPhaeron 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
ShizCalevandAnturK 2d133d3668 Fixed inhand for cable cuffs (#29811) 2017-08-11 09:51:46 +02:00
FrozenGuy5andAnturK 026d4ed8da initialize() (#29807) 2017-08-11 09:50:00 +02:00
Jordan BrownandAnturK e71ae59245 Ports weaponry to Initialize (#29804) 2017-08-11 09:49:30 +02:00
Jordan BrownandAnturK a10a7e6016 Ports weapons to Initialize() (#29803) 2017-08-11 09:49:08 +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
FrozenGuy5andCheridan 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
pubbyandLeo 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
ShizCalevandLeo 922422a159 Window Spawners mk2 (#29792) 2017-08-10 08:17:30 -03:00
Jordan BrownandGitHub 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 BrownandAnturK 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
Jordan BrownandLeo d1ae0a0c95 Adds helpers to avoid << use (#29611) 2017-08-09 00:27:54 -03:00
octareenroon91andLeo a926a43767 Fix RCL loading (#29773) 2017-08-08 16:58:13 -03:00
Jordan Brown 5c696a582d Merge pull request #29756 2017-08-08 09:59:07 -04:00
Jordan Brown 0c1aa057d8 Merge pull request #29766 2017-08-08 09:59:03 -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
Joan Lung 91ef47fb8f just that 2017-08-07 11:42:37 -04:00
Joan Lung 26da0f40b5 Belligerent now has a visible indicator 2017-08-07 11:39:03 -04:00
Cyberboss a2dc6e2c5a Merge pull request #29724 2017-08-06 18:58:26 -04:00
FirecageandKorPhaeron f65786a8cf The inhands of the Dark Blessing chaplain weapon is now visible. (#29727) 2017-08-05 11:02:21 -03:00
AnturKandLeo d1bb1686cb Fixes showers breaking lighting objects. (#29706) 2017-08-05 09:43:00 -03:00
FrozenGuy5andGitHub e28634eb91 initaliazieizlie 2017-08-05 01:57:54 +01:00
FrozenGuy5andGitHub 552b851445 Update light.dm 2017-08-05 01:45:27 +01:00
Cyberboss 7e6c1198e9 Merge pull request #29695 2017-08-04 10:21:47 -04:00
Cyberboss fc0a102753 Merge pull request #29693 2017-08-04 10:21:07 -04:00
orangesandGitHub 6b6fc91172 Merge pull request #29623 from Cyberboss/TiredOfBS
Removes all checks for subsystem existence
2017-08-04 23:54:47 +12:00
FrozenGuy5andGitHub 76ee209a6c flora initialize poo 2017-08-03 22:16:49 +03:00