cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-10 09:31:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,553 Commits 26 Branches 2 Tags
4af432dd2d3a9908480bbc56028e4e80487215af
Commit Graph

4452 Commits

Author SHA1 Message Date
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
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
DZD
ba82f03d7c Drill and drone fixes 
- Fixes mining drones having access to a plasma cutter energy weapon,
replaced with a diamond drill. Functionality is almost identical to what
it was with old plasma cutters.
- Pathing fixes for diamond drills.
 2015-08-01 10:13:54 -04: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
Fox-McCloud
151d8d3229 Merge pull request #1585 from Markolie/headlamp 
Add borg headlamp, add movement states for some borgs, add jetpack overlay to all miner borgs
 2015-07-31 13:34:53 -04:00
Fox-McCloud
ab083aff50 Mining Fixes 2015-07-30 17:01:59 -04: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
Fox-McCloud
da8ac741e9 Merge pull request #1510 from Krausus/FurtherTrayedStructureFixes 
Further Morgue & Crematorium Fixes
 2015-07-14 19:56:56 -04:00
TheDZD
09c5c9d8f5 Merge pull request #1503 from Fox-McCloud/more-explosion-tweaks 
More Explosion Optimizaitons
 2015-07-14 17:33:07 -04:00