Commit Graph

9470 Commits

Author SHA1 Message Date
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
TheDZD
13689db0ef Merge pull request #1652 from Fox-McCloud/fox-is-evil
Ports over Airhorns
2015-08-07 17:56:14 -04:00
TheDZD
ff1395048c Merge pull request #1659 from Fox-McCloud/bot-processing
Bot GC+Processing Fix
2015-08-07 12:06:06 -04:00
Aurorablade
bec3b6bf6e Typo and color macro fix 2015-08-06 23:57:34 -04:00
Fox-McCloud
5f96fc9ca8 Bot GC+Processing Fix 2015-08-06 21:43:16 -04:00
TheDZD
6c3807ab0f Merge pull request #1650 from Fox-McCloud/IAA-remap
Internal Affairs Remap+Tweaks
2015-08-06 19:22:12 -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
ba5115b7e9 Merge pull request #1646 from FalseIncarnate/master
Botany Modular Icon Revert, also Peanuts
2015-08-06 16:41:46 -04:00
Fox-McCloud
e18838ffa4 Merge pull request #1647 from tigercat2000/pdatones
Ring-sound system for PDA's; Ringtones make sounds
2015-08-06 16:41:20 -04:00
Fox-McCloud
395646edbe Merge pull request #1653 from Markolie/alarms
Runtime/bug fixes
2015-08-06 16:40:18 -04:00
Mark van Alphen
fd9ca9102c Runtime fixes 2015-08-06 18:40:00 +02: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
Fox-McCloud
c3ad070066 Ports over Airhorns 2015-08-06 00:42:17 -04:00
Fox-McCloud
1e0ce54165 more fixes and tweaks 2015-08-05 23:00:21 -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
78950ec682 tweak 2.0 2015-08-05 20:12:11 -04:00
Fox-McCloud
3453dca2b7 Internal Affairs Remap+Tweaks 2015-08-05 18:22:28 -04:00
DZD
7637fe9582 Finalizes Changes
- Adds action buttons for Shadowling spells
- Fixes bugs and runtimes found while testing.
- Remove stupid snowflake check that allowed mobs with environment_smash
>= 2 to smash reinforced walls, but not regular walls (what the actual
fuck?).
2015-08-05 18:22:01 -04:00
Tigercat2000
ac84732fe2 Ring-sound system for PDA's; Ringtones make sounds
This commit adds a system which allows a pre-defined custom sound for the
noise a PDA makes when recieving a message, based on what the 'ringtone'
is set to. Ringtones without an entry will make the default beeping
noise.

Included special noises;
 Explosion for 'boom'
 Slipping noise for 'slip'
 Bikehorn for 'honk'
 Vox shriek for 'SKREE' (Capitals matter)
 Shortened holy ambience music for 'holy'
 Xenomorph hiss for 'xeno'

Also included; New folder, /sound/items/PDA/, specifically for the
ringtones.
Includes:
 __credits.dm
   Used for giving credit to the source of a sound file in said folder,
   for sounds licensed under such a license that requires credit.
   Not included in the compilation.

 ambicha4-short.ogg
   Shortened version of sound/ambience/ambicha4.ogg; Used for 'holy'
   ringtone.
2015-08-05 09:24:38 -07:00
FalseIncarnate
fb203fe569 Botany Modular Icon Revert, also Peanuts
Removes modular sprites from nearly all pre-defined seed products.
- The following plants still utilize modular icons:
- Random Seeds (Strange Plants)
- Grass
- S'randar's Hand leaves
- Messa's Tear leaves
- Telriis Grass
- Thaa'dra Lichen
- Jurl'mah Reeds
- Amauri Plant
- Gelthi Plant
- Vale Bush
- Surik Vine
- Test and Test 2

Added a new plant, peanuts!
- Seeds available from MegaSeed vendor in hydroponics
- Will be included in future kitchen recipes in a separate PR
2015-08-05 05:05:26 -04:00
TheDZD
f6c92d0667 Merge pull request #1636 from Fox-McCloud/cattleprod
Baton Fixes and Cattleprod Buff
2015-08-04 21:06:41 -04:00
TheDZD
72583042d4 Merge pull request #1641 from Fox-McCloud/xeno-camera-fix
Fixes Xeno Camera Slashing
2015-08-04 20:44:30 -04:00
Fox-McCloud
118dd31937 Fixes Hologram Runtime 2015-08-04 19:54:30 -04:00
Fox-McCloud
18e017fccf Fixes Xeno Camera Slashing 2015-08-04 19:24:13 -04:00
Fox-McCloud
e8ece032c9 Merge pull request #1635 from tigercat2000/plaintextisbadsometimes
Replace (TM) in mirror title with actual TM character
2015-08-03 21:25:33 -04:00
Fox-McCloud
fc8b310d2d Baton Fixes and Cattleprod Buff 2015-08-03 21:12:29 -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
Tigercat2000
b8be8cb4ca Replace (TM) in mirror title with actual TM character) 2015-08-03 14:53:28 -07:00
Fox-McCloud
82f62da60f Merge pull request #1604 from TheDZD/helper
Subtypesof Helper Proc
2015-08-03 17:44:01 -04:00
TheDZD
525955d8bf Merge pull request #1632 from Fox-McCloud/scheduler-tweaks
Process Scheduler Tweaks
2015-08-03 17:36:19 -04:00
Fox-McCloud
080b1b30db Merge pull request #1612 from Markolie/appearancechanger
Ports Bay's appearance changer
2015-08-03 17:30:58 -04:00
Mark van Alphen
027686ba52 Buff scrubbers and add widenet 3x3 scrubbing 2015-08-03 23:22:25 +02:00
Fox-McCloud
62e8889353 Process Scheduler Tweaks 2015-08-03 17:15:12 -04:00
Fox-McCloud
fdf16bcdfa Pod Door Fix 2015-08-03 16:48:01 -04:00
DZD
d9bb30f47a Replaces typesof with subtypesof where applicable 2015-08-03 11:04:28 -04:00
Markolie
f213cf5501 Fix cable coil sprite 2015-08-03 06:37:12 +02:00
Markolie
122cec7d42 Tweak Vox alarm mode 2015-08-03 04:17:26 +02:00
Markolie
a2f8141036 NanoUI power monitor/AI subsystem, mapfix 2015-08-03 03:38:38 +02: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
Markolie
62f2f64063 Make SMES start empty, GC fix 2015-08-02 22:45:25 +02:00
Markolie
161a450d76 Air alarm emag support 2015-08-02 22:39:13 +02:00
Markolie
5f95452f55 Air alarm LINDA support 2015-08-02 22:25:11 +02:00
Fox-McCloud
a022f14a4a Merge pull request #1607 from FalseIncarnate/master
Removes explosion immunity from chameleon projector
2015-08-02 14:55:06 -04:00
Markolie
be9ea0b540 Alarm system tweaks 2015-08-02 19:20:37 +02:00
Markolie
73e94b5dc4 Alarm system overhaul 2015-08-02 07:13:03 +02:00
Markolie
e35431da34 Port Bay's appearance changer 2015-08-01 23:22:20 +02:00
Markolie
7d1f077378 Fix https://github.com/ParadiseSS13/Paradise/issues/1350 2015-08-01 23:01:50 +02:00