Commit Graph

1191 Commits

Author SHA1 Message Date
Tigercat2000
ca921216fe New proc to replace world.log <<, log_to_dd()
This commit changes every 'world.log <<' message with a loggable proc-
log_to_dd().

This is adjustable in the config; If LOG_WORLD_OUTPUT is present, all
things sent to world.log will show up in the standard /data/logs/ logs.

These logs will contain the following (in order):
 Timestamp
 "DD_OUTPUT:"
 The message.

The config option for this, by default, is turned off.
2015-08-14 18:18:57 -07:00
Markolie
ce1bb4c80f Update syndi toolbox description 2015-08-13 21:02:42 +02:00
TheDZD
56af11019a Merge pull request #1708 from Markolie/caching
Caching
2015-08-11 17:42:57 -04:00
Markolie
7101ccde02 Further caching updates 2015-08-11 18:28:45 +02:00
Markolie
ebdfeae887 Add caching to air alarms, apcs and power monitoring computers 2015-08-11 15:56:37 +02:00
Markolie
09fc2bc54f Add caching to crew monitor 2015-08-11 15:24:49 +02:00
DZD
93df90d09f Lightning Bolt Buff
- Now always bounces 5 times (for a total of 6 hits).
- Now always does at least 15 damage per hit, with a maximum of 50.
- Now affects people wearing insulated gloves, tough luck if they're wearing an fully insulated chest-covering armor though.
2015-08-09 18:58:53 -04:00
DZD
16bdb00351 Nukes useless /wizard/ spell pathing
This had no fucking reason to exist, Shadowling spells are not wizard
spells, genetics powers are not wizard spells, ghost Booing is not a
wizard spell, etc.
2015-08-08 14:06:50 -04:00
TheDZD
70fc864ce8 Merge pull request #1651 from Fox-McCloud/shadowling-surgery-and-fixes
Shadowling Surgery and Fixes
2015-08-06 19:21:38 -04:00
Fox-McCloud
46b22da03e Fixes Explosion and Poison Traitor Bottles 2015-08-06 16:55:47 -04:00
Fox-McCloud
5ae43f0875 Shadowling Surgery and Fixes 2015-08-05 21:52:17 -04:00
Fox-McCloud
050e111157 Merge pull request #1603 from TheDZD/shadowling
Shadowling Updates
2015-08-05 20:26:25 -04:00
Fox-McCloud
fb381e5d84 Merge pull request #1626 from TheDZD/wiznerd
Adminboooooooooooooos
2015-08-03 21:19:21 -04:00
Mark van Alphen
8f19323fdd Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into alarms
Conflicts:
	code/__HELPERS/lists.dm
2015-08-03 23:59:45 +02:00
Fox-McCloud
82f62da60f Merge pull request #1604 from TheDZD/helper
Subtypesof Helper Proc
2015-08-03 17:44:01 -04:00
Mark van Alphen
027686ba52 Buff scrubbers and add widenet 3x3 scrubbing 2015-08-03 23:22:25 +02:00
DZD
1a15dbd432 Adminboooooooooooooos 2015-08-03 11:25:37 -04:00
DZD
d9bb30f47a Replaces typesof with subtypesof where applicable 2015-08-03 11:04:28 -04:00
Markolie
89665cfe5c Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into alarms
Conflicts:
	_maps/map_files/RandomZLevels/moonoutpost19.dmm
	_maps/map_files/cyberiad/cyberiad.dmm
	code/controllers/master_controller.dm
	code/game/machinery/alarm.dm
	code/modules/power/apc.dm
2015-08-03 00:04:24 +02:00
Fox-McCloud
7d806cbd12 Merge pull request #1602 from Markolie/powernet
Powernet rework
2015-08-02 17:26:37 -04:00
Fox-McCloud
330e5c0c8d Fixes Nuke Ops Energy Sword/Shield Uplink Purchase 2015-08-02 02:11:03 -04:00
Markolie
73e94b5dc4 Alarm system overhaul 2015-08-02 07:13:03 +02:00
Markolie
dd067f582a Update smartfridge types, merge branch 'master' of https://github.com/ParadiseSS13/Paradise into powernet
Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
2015-08-01 19:35:39 +02:00
DZD
ed24ac47de Up to date with -tg-
- Ports /tgstation/-tg-station#10871.
- Fixes some errors currently present in the above.
- Ports /tgstation/-tg-station#9927.
2015-07-31 18:15:45 -04:00
Markolie
51035f931e Powernet rework 2015-07-31 23:59:41 +02:00
Fox-McCloud
0e6a3c36cf Lowers Cost of Clown Grenades 2015-07-30 16:39:43 -04:00
Markolie
660ffad9a0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	code/modules/power/port_gen.dm
2015-07-30 03:08:33 +02:00
Fox-McCloud
1ee7853d65 Merge pull request #1476 from TheDZD/mining2
Mining Overhaul [Soon™]
2015-07-29 20:51:24 -04:00
Markolie
c67bb095fb Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-07-28 18:40:44 +02:00
Markolie
706d19c24f Reference/typo fixes 2015-07-28 17:28:56 +02:00
Markolie
b6e446c446 NanoUI traitor uplink 2015-07-28 06:28:01 +02:00
Fox-McCloud
3ecaadde48 Merge pull request #1571 from Markolie/master
Fixes
2015-07-27 11:46:35 -04:00
Markolie
7dbd45857a Fix cult sacrifice objective 2015-07-26 06:06:04 +02:00
Fox-McCloud
eb694a50eb Updates Nuke Disk Spawning 2015-07-24 17:33:25 -04:00
DZD
66688f4dbb Fixes conflicts in icons/obj/gun.dmi. 2015-07-24 15:29:20 -04:00
Fox-McCloud
0945859066 Merge pull request #1554 from Markolie/master
Fix OneHuman law
2015-07-22 16:57:23 -04:00
Markolie
4cfd1e4340 Fix OneHuman law 2015-07-22 18:35:09 +02:00
Fox-McCloud
fde654557c Minor Uplink Cost Adjustments 2015-07-18 21:54:32 -04:00
Fox-McCloud
728dc57f30 Re-Enables News 2015-07-17 00:09:14 -04:00
TheDZD
fbbceac377 Merge pull request #1499 from Fox-McCloud/blob-update
[Ready To Merge!]Blob Mode Major Overhaul
2015-07-16 20:34:08 -04:00
DZD
29e70854e9 Fix merge conflicts
🖕 map conflicts over lines that weren't even edited by both upstream
and this branch.
2015-07-15 22:28:12 -04:00
Fox-McCloud
6cbdad58cf Sun Controller Scheduler Integration 2015-07-13 20:54:10 -04:00
Fox-McCloud
04511d3f0b Blob Mode Major Overhaul 2015-07-12 02:45:40 -04:00
Fox-McCloud
898bcea1e8 Merge pull request #1489 from FalseIncarnate/master
Kitchen Machine Refactor and Max Item fix
2015-07-11 22:19:07 -04:00
Fox-McCloud
f5ce957f33 qdel pass II 2015-07-11 02:10:31 -04:00
DZD
412443dbf1 Fix non-icon merge conflicts 2015-07-10 19:57:59 -04:00
FalseIncarnate
8a8011acbf Kitchen Machine Refactor and Max Item fix
Refactors the code for Microwaves, Ovens, Grills, and Candy Makers to
utilize a shared parent which holds the common procs.
- This means any new additions or fixes will only need to be implemented
in one place, rather than 4, to affect them all.
- Also reduces file sizes on the individual machines' files by removing
a lot of the duplicate code

Updated the code for the kitchen machines to be more modular and fixed
some issues.
- Replaced color macros with span classes
- Replaced hardcoded names with src references
- Each machine has a cook_verbs list which is used to create the in use
message (Microwaving in progress)
- Each machine has variables to define the icon states for the different
states of the machine (on, off, broken, dirty, open).
- Changed a few formerly global variables to not be global, as this
would cause issues with the shared code (microwave with candy maker
recipes for example)

Fixed a bug where the microwave would be considered "full" before having
all of the ingredients for a recipe
- Created a new proc to count the number of items and fruits in a recipe
to determine the max_n_items value

Map Edits to Cyberiad and associated Z-levels for pathing changes
(map-merged)
- MetaStation will need to be updated as well, I'll do this in another
PR unless someone else beats me to it.
2015-07-10 09:46:30 -04:00
Fox-McCloud
54f59b9899 Pass II 2015-07-09 19:51:40 -04:00
DZD
916f9bf4bb Sort of compiles
Time to fix xenoarch, and then the map.
2015-07-09 15:55:36 -04:00
Fox-McCloud
0dbea7621f The Great Del() Cull of 2015 2015-07-09 02:48:34 -04:00