Commit Graph

40933 Commits

Author SHA1 Message Date
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
MoreRobustThanYou 947b1a5edd Makes mulligan antag check for gamemode required players 2017-08-10 18:48:11 -04: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
Jordan Brown f377a14f1c Makes the ahelp topic give the permissions warning 2017-08-10 15:55:40 -04: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
Jordan Brown a7be74fec8 Merges the two turf/Entereds 2017-08-10 09:59:23 -04:00
Jordan Brown 6d96de2638 Fixes turf slipping 2017-08-10 09:46:37 -04: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
Cyberboss 8d702a196a Moves most of world.dm 2017-08-09 00:41:05 -04: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
octareenroon91 a926a43767 Fix RCL loading (#29773) 2017-08-08 16:58:13 -03:00
shizcalev c75360b624 Refined Station Z test area verb output 2017-08-08 13:33:57 -04:00
Jordan Brown e1ac655438 Merge pull request #29750 2017-08-08 09:59:11 -04: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
Jordan Brown 1d05c4a936 Merge pull request #29767 2017-08-08 09:59:00 -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