Markolie
0598ebecb9
Remove unused variable causing a warning
2015-08-13 20:25:49 +02:00
Fox-McCloud
1cce7c87be
Merge pull request #1716 from Markolie/rndserver
...
Give syndi toolbox insulated gloves
2015-08-12 22:27:53 -04:00
Fox-McCloud
427a4437e8
Merge pull request #1713 from Markolie/master
...
Fixes
2015-08-12 17:37:22 -04:00
Fox-McCloud
e7a18159b7
Merge pull request #1711 from Markolie/icons
...
Add barber hud icon, add unique ID card for supervisors
2015-08-12 16:32:33 -04:00
Markolie
362a817d79
Runtime and bug fixes
2015-08-12 18:20:53 +02:00
Markolie
d1e776a8f2
Give syndi toolbox insulated gloves
2015-08-12 02:26:21 +02:00
TheDZD
56af11019a
Merge pull request #1708 from Markolie/caching
...
Caching
2015-08-11 17:42:57 -04:00
Markolie
94044e6f76
Whoops
2015-08-11 22:26:29 +02:00
Markolie
27d305522b
Add barber hud icon, add unique ID card for supervisors
2015-08-11 22:24:38 +02:00
Markolie
7101ccde02
Further caching updates
2015-08-11 18:28:45 +02:00
Markolie
4af432dd2d
Fix incorrect power monitor variable name
2015-08-11 16:03:21 +02:00
Markolie
36f2efcef7
Add caching to PDA power monitor
2015-08-11 15:59:08 +02:00
Fox-McCloud
7a24a015bc
ID Fixups
2015-08-10 18:36:26 -04:00
Fox-McCloud
6b76e591f3
Merge pull request #1686 from Markolie/agentid
...
ID card/agent ID rework
2015-08-10 17:32:39 -04:00
Fox-McCloud
5281580eb6
Merge pull request #1697 from Krausus/NiceRoundExplosions
...
Explosion Fixes and Profiling Improvement
2015-08-10 17:31:09 -04:00
Fox-McCloud
a23249c61b
Merge pull request #1700 from Markolie/gamemode
...
Fix traitor end of round message
2015-08-10 17:30:58 -04:00
Markolie
6a129739b3
Fix traitor end of round message
2015-08-10 20:00:53 +02:00
Markolie
99c7bbed55
Add card skin descriptions, let agent ID's change photo, re-add photos and job blacklist update
2015-08-10 16:00:58 +02:00
Krausus
3c16a8bb75
Explosion fixes and profiling improvement
...
Fixes lopsided reactionary explosions and explosions calling ex_act(0)
on stuff on non-exploded turfs. Also changes explosion profiling to use
btime when available.
2015-08-09 23:52:47 -04:00
Markolie
63bff3e31d
Fix double attack_self message
2015-08-10 04:29:17 +02:00
Markolie
fe512b3776
Add slot removal/additions on identification computers
2015-08-10 02:58:00 +02:00
TheDZD
7dd8862ad4
Merge pull request #1689 from Fox-McCloud/boom-fix
...
Explosion Performance Fix
2015-08-09 20:35:57 -04:00
Fox-McCloud
92b69aec35
Explosion Performance Fix
2015-08-09 20:14:22 -04:00
Markolie
c9ed5fe5bc
Fix typo
2015-08-09 23:46:40 +02:00
Markolie
034cf8ef69
ID card/agent ID rework
2015-08-09 23:42:55 +02:00
Markolie
9f6d46ddf0
Close span tags
2015-08-09 19:37:33 +02:00
Markolie
f09584e99a
Fix amputees picking up items, make sure viruses don't affect robotic limbs
2015-08-09 19:36:39 +02:00
Markolie
bc424946c4
Add attack delay to alien nests
2015-08-09 17:27:02 +02: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
6c3807ab0f
Merge pull request #1650 from Fox-McCloud/IAA-remap
...
Internal Affairs Remap+Tweaks
2015-08-06 19:22:12 -04:00
Fox-McCloud
46b22da03e
Fixes Explosion and Poison Traitor Bottles
2015-08-06 16:55:47 -04:00
Fox-McCloud
c3ad070066
Ports over Airhorns
2015-08-06 00:42:17 -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
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
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
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
Fox-McCloud
080b1b30db
Merge pull request #1612 from Markolie/appearancechanger
...
Ports Bay's appearance changer
2015-08-03 17:30:58 -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
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
e35431da34
Port Bay's appearance changer
2015-08-01 23:22:20 +02:00
FalseIncarnate
4b84d7ebd8
spawn() added to ex_act
2015-08-01 15:48:29 -04:00
Markolie
aca3a2cecb
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into powernet
...
Conflicts:
_maps/map_files/cyberiad/cyberiad.dmm
code/game/machinery/alarm.dm
code/modules/power/smes.dm
2015-08-01 21:44:47 +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
Fox-McCloud
10ceb14432
Merge pull request #1608 from TheDZD/mining2
...
Diamond Drill and Drone Fixes
2015-08-01 13:13:02 -04:00
