TheDZD
13689db0ef
Merge pull request #1652 from Fox-McCloud/fox-is-evil
...
Ports over Airhorns
2015-08-07 17:56:14 -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
Fox-McCloud
c3ad070066
Ports over Airhorns
2015-08-06 00:42:17 -04:00
Fox-McCloud
3453dca2b7
Internal Affairs Remap+Tweaks
2015-08-05 18:22:28 -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
TheDZD
f6c92d0667
Merge pull request #1636 from Fox-McCloud/cattleprod
...
Baton Fixes and Cattleprod Buff
2015-08-04 21:06:41 -04:00
Fox-McCloud
fc8b310d2d
Baton Fixes and Cattleprod Buff
2015-08-03 21:12:29 -04:00
Fox-McCloud
82f62da60f
Merge pull request #1604 from TheDZD/helper
...
Subtypesof Helper Proc
2015-08-03 17:44: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
Fox-McCloud
7d806cbd12
Merge pull request #1602 from Markolie/powernet
...
Powernet rework
2015-08-02 17:26:37 -04:00
FalseIncarnate
4b84d7ebd8
spawn() added to ex_act
2015-08-01 15:48:29 -04: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
FalseIncarnate
f302506fbd
Removes explosion immunity from chameleon projector
...
Being disguised via chameleon projector will no longer cause the user to
shrug off even the nastiest of explosions. The explosion will now break
the illusion AND cause the appropriate strength ex_act on the user.
2015-08-01 05:30:39 -04:00
Markolie
b3b226fd59
Fix some oversights
2015-08-01 00:52:04 +02:00
Markolie
51035f931e
Powernet rework
2015-07-31 23:59:41 +02:00
Markolie
c2cbaa7627
Add borg headlamp, add movement states for surgeon/miner bot, add jetpack overlay to all miner borgs
2015-07-30 19:33:49 +02: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
Fox-McCloud
e517d172be
Banana Grenade Fix
2015-07-28 21:44:46 -04:00
Markolie
b8a7ca7d1b
Update NanoUI to be up-to-date with Bay
2015-07-28 21:04:44 +02:00
Markolie
154a282a0d
NanoUI caching for cameras/crew manifest
2015-07-28 19:54:17 +02:00
Markolie
c67bb095fb
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
2015-07-28 18:40:44 +02:00
Markolie
27ec05589b
Missing qdel
2015-07-28 17:31:39 +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
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
SamCroswell
d84dfe5a49
ERT Rework - Code Changes
2015-07-20 19:37:56 -04:00
Matt
a106daa447
Holopad and binary talk
...
Fixes https://github.com/ParadiseSS13/Paradise/issues/1517 and
https://github.com/ParadiseSS13/Paradise/issues/1483 Aboot it
2015-07-16 14:44:51 +02: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
409fefa4b3
Power Computer and Computer Fixes
2015-07-15 07:00:46 -04:00
Krausus
6376907560
Further fixes to morgues and crematoriums
2015-07-14 04:08:56 -04:00
Fox-McCloud
e4d6acb538
Changes a few del to del()
2015-07-10 23:28:08 -04:00
DZD
3ed90434e0
Projectile, borg, and RnD fixes.
2015-07-10 21:36:23 -04:00
DZD
412443dbf1
Fix non-icon merge conflicts
2015-07-10 19:57:59 -04:00
DZD
d4cf433e7c
Various fixes, changes, additions, and removal of old features.
...
More changes
2015-07-10 19:41:27 -04:00
Fox-McCloud
068adc1f0a
Shard Runtime Fix
2015-07-10 05:44:29 -04:00
TheDZD
333eb83dee
Merge pull request #1477 from Fox-McCloud/chameleon
...
Updates Chameleon Projector
2015-07-09 22:39:32 -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
Fox-McCloud
a117067123
Updates Chameleon Projector
2015-07-08 18:09:27 -04:00
Fox-McCloud
6e87b96501
Pass 3
2015-07-08 01:34:53 -04:00
Fox-McCloud
0fd80d0b1f
pass one fix
2015-07-08 01:09:10 -04:00
Fox-McCloud
9dc27ce126
Destroy Pass II
2015-07-07 22:26:28 -04:00
TheDZD
b02cd94168
Merge pull request #1467 from Fox-McCloud/del-the-dels
...
Replaces Remaining Del()'s
2015-07-07 19:07:53 -04:00
Fox-McCloud
40c047f89a
Merge pull request #1464 from tigercat2000/gibtoy
...
Minigibber toy
2015-07-07 16:35:36 -04:00
