Commit Graph

346 Commits

Author SHA1 Message Date
Aurorablade
769a5d3bff FUUUUUUUUUUUUUUUUUUUUUUUUUUUU
Merge conflict EXTREAME FIX
2015-10-08 18:38:45 -04:00
Markolie
c5c64413a1 Pipenet overhaul 2015-09-21 02:11:54 +02:00
Markolie
0bd697805d Update event turf handling, fix infestation event 2015-09-18 17:38:15 +02:00
Markolie
08e36394ba Consolidate power failure procs 2015-09-17 22:44:15 +02:00
Markolie
ed9a63763e More event tweaks 2015-09-17 22:25:35 +02:00
Markolie
34552f259c Event updates 2015-09-17 21:34:51 +02:00
Markolie
24d100e351 Increase moderate carp event odds 2015-09-17 19:04:19 +02:00
Markolie
edbfacb33c Remove mundane carp event 2015-09-17 19:03:03 +02:00
Markolie
f281dff7fc Radiation damage fix 2015-09-12 18:51:24 +02:00
Markolie
2787c2fd46 sortAtom improvements 2015-08-28 23:52:27 +02:00
Spacemanspark
8d691a2944 Making TullyBBurnalot happy (AKA the dumbest grammar PR ever.)
Tully is a nerd.
2015-08-20 16:17:38 -05:00
Fox-McCloud
f635d9c054 Merge pull request #1778 from Markolie/events
Revenant update, event weight tweaks
2015-08-19 17:04:14 -04:00
Markolie
8bede1db99 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ipcmasterrace
Conflicts:
	code/modules/mob/living/simple_animal/friendly/fox.dm
	code/modules/organs/organ_alien.dm
2015-08-18 18:38:59 +02:00
Markolie
a15097f6fb Revenant update, event weight tweaks 2015-08-17 22:08:25 +02:00
Mark van Alphen
6abb1f8730 Merge pull request #1754 from tigercat2000/log_to_dd
New proc to replace world.log <<, log_to_dd()
2015-08-16 17:49:00 +02:00
Markolie
e6408b96c2 IPC overhaul 2015-08-15 23:52:26 +02:00
Krausus
bc41922cbc Fixes bad PDA tnote entries and minor PDA bugs 2015-08-14 23:33:38 -04:00
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
TheDZD
171c0d2d6c Merge pull request #1387 from Aurorablade/STILLALOTOFBLOOD
[Need Feedback] TG Slaughter Demon Port Remake, THE REGIBBINGING
2015-08-07 18:19:38 -04:00
Aurorablade
95565847b7 Changes
Revert to the orignal TG method of just shoving a player into the daemon
on vial break.

did the same for the event (i still like using the revenant spawns
rather then carp spawns for that, not as disoriniting to me)

Added reference to BLOODCRAWL_EAT i missed

Devouring now heals more types of damage

Removes some gore abilitys...I got overzealous in wanting
blood....Keeping the spooky demon head whisper...
No don't ask why i called it Pustle...My brain frightens me...
2015-08-06 01:56:59 -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
DZD
d9bb30f47a Replaces typesof with subtypesof where applicable 2015-08-03 11:04:28 -04:00
Markolie
73e94b5dc4 Alarm system overhaul 2015-08-02 07:13:03 +02:00
Aurorablade
5b0f43ade1 CRAWLING IN MY CRAWL! THESE WOUNDS THEY WILL NOT CRAWL
Update based on
2015-07-29 07:14:33 -04:00
Markolie
bda9f75698 Include permabrig in prison break 2015-07-29 06:50:46 +02:00
Markolie
69f7e04719 Prison break refactor, Requests Console refactor 2015-07-29 00:12:44 +02:00
Aurorablade
92ec49705b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into STILLALOTOFBLOOD 2015-07-26 23:29:32 -04:00
Aurorablade
0bb5dd626b Colonectomy
Various fixes by feedback
Render Item refactor to modular system
2015-07-20 17:04:32 -04:00
Aurorablade
f6cb04468d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into STILLALOTOFBLOOD 2015-07-17 10:14:46 -04:00
Fox-McCloud
728dc57f30 Re-Enables News 2015-07-17 00:09:14 -04:00
Aurorablade
41e98f489f Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into STILLALOTOFBLOOD 2015-07-15 15:40:11 -04:00
Fox-McCloud
70b386d861 derp 2015-07-13 00:40:26 -04:00
Fox-McCloud
18b14d6c6d updated blob event 2015-07-13 00:04:50 -04:00
Fox-McCloud
0dbea7621f The Great Del() Cull of 2015 2015-07-09 02:48:34 -04:00
Fox-McCloud
0e8619a202 Destroy Pass III 2015-07-08 03:39:52 -04:00
Aurorablade
1c583a3597 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into STILLALOTOFBLOOD 2015-06-29 19:31:49 -04:00
ZomgPonies
62d8435b12 Merge pull request #1410 from Fox-McCloud/ether
[Chemistry] Adds in Ether
2015-06-29 19:05:51 -04:00
ZomgPonies
f969a0f659 Merge pull request #1394 from Fox-McCloud/ai-vox
AI Vox Refactor
2015-06-29 19:04:05 -04:00
Fox-McCloud
a89ddd5a7d Adds in Ether 2015-06-28 20:39:26 -04:00
Fox-McCloud
2a34b600a9 Merge pull request #1397 from Krausus/GarbageCollectorWasGarbage
Garbage Collector Fixes/Tweaks/Cleanup/Documenting
2015-06-28 06:36:04 -04:00
Krausus
b386cec388 Initial GC fixes/tweaks/cleanup/documenting 2015-06-27 01:56:57 -04:00
Fox-McCloud
d843632f95 AI Vox Refactor 2015-06-26 17:30:48 -04:00
Aurorablade
b6429486eb LETS DO THE GIT WARP AGAIN! LETS DO THE GIT WARP AGAIN!
So i did a thing..and it messed up alot of other things..so i remade the
thing..
Adjusted some spans and redid the spawn locs based on the ghostie antag
2015-06-24 21:42:35 -04:00
Fox-McCloud
02aaca9c7b Merge remote-tracking branch 'upstream/master' into revenants 2015-06-23 23:44:20 -04:00
Tigercat2000
7c9139d6e0 Bay/-tg- Meteor port
Meteors now have different types, properly integrated.
Meteoract has been removed, meteors now just call ex_act.
2015-06-21 18:39:39 -07:00
Fox-McCloud
8e450f99c8 tweaks and optimization 2015-06-21 02:16:18 -04:00
Fox-McCloud
93392f8e90 Explosion Rework 2015-06-20 04:13:55 -04:00
Fox-McCloud
09097b38ed Revenant 2015-06-13 20:10:02 -04:00
Fox-McCloud
b398977d16 runtime fix 2015-06-11 23:13:14 -04:00
Fox-McCloud
5b5209e0a5 Re-adds Pyroclastic Anomally Event 2015-06-11 11:30:49 -04:00