Commit Graph

22069 Commits

Author SHA1 Message Date
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
Leo
2b0e6128b8 Changes the check to prevent any possible href spoofing 2017-08-11 17:31:03 -03:00
Leo
fedccea519 Merge pull request #29800 from MrStonedOne/betterlogaccess
Massively improves downloading/viewing logs.
2017-08-10 12:49:02 -03: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
Remie Richards
8b2c02a46b the standard is I! stupid code 2017-08-07 22:20:42 +01:00
Remie Richards
038fca482d Fixes repairing jumpsuits. 2017-08-07 22:19:12 +01:00
shizcalev
73561bc24a Revert: Minor supermatter code refactor(#28848)
Moves repeated code into procs, as well as adding processing handicaps/damage hardcaps to things that really need them. (reverted from commit 59ce8fa832)
2017-08-07 16:02:03 -04:00
Tacolizard
6d76903ed4 ian 2017-08-07 11:08:27 -07:00
Tacolizard
7d92f8d365 hivebot init 2017-08-07 11:03:34 -07:00
Tacolizard
bbb1c166b7 beepsky init 2017-08-07 10:40:14 -07:00
Cyberboss
3fcbfcef65 Merge pull request #29746 2017-08-07 13:22:30 -04:00
Jordan Brown
2a5903aa80 Makes dummy humans queue instead of harddel 2017-08-06 19:06:38 -04:00
Cyberboss
49d3b8e3b3 Merge pull request #29740 2017-08-06 18:58:39 -04:00
Cyberboss
7d325ea205 Merge pull request #29739 2017-08-06 18:58:36 -04:00
Cyberboss
f44d4fee9b Merge pull request #29725 2017-08-06 18:58:29 -04:00
Cyberboss
a2dc6e2c5a Merge pull request #29724 2017-08-06 18:58:26 -04:00
shizcalev
f8b3f4e863 Test Areas Station Z verb 2017-08-06 15:26:51 -04:00
Leo
2176331d79 Fixes adminhelp sending the wrong message to players 2017-08-06 13:52:59 -03:00
oranges
1955c2c297 Merge pull request #29718 from ShizCalev/apc-corrections
Fixes areastring grabbing area subtypes
2017-08-06 20:20:21 +12:00
kevinz000
59ce8fa832 Minor supermatter code refactor(#28848)
Moves repeated code into procs, as well as adding processing handicaps/damage hardcaps to things that really need them.
2017-08-06 20:17:37 +12:00
kingofkosmos
e526e736f4 Fixes hair sticking through hats. (#29651)
This is done by using the dynamic_hair flag. Dynamic_hair set to nothing wherever the hair needs to stick through (kitty ears etc).
2017-08-06 20:12:24 +12:00
FrozenGuy5
2000984b5a Grossed out grammar fix (#29707) 2017-08-06 20:10:00 +12:00
oranges
fffde40640 Merge pull request #29699 from Fox-McCloud/filter-a-filter
Improves Tesla Performance
2017-08-06 20:07:16 +12:00
Joan Lung
413c70f711 Fixes Explosive Lattice blobs being way more fragile than they should be 2017-08-05 22:17:20 -04:00