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
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
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
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
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
