cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-26 18:21:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,113 Commits 26 Branches 2 Tags
1d2fb1491fbc3d8dfd0722efcc9a2ba4d8a28fbd
Commit Graph

13119 Commits

Author SHA1 Message Date
Chinsky
1d2fb1491f Adds 3 office clutter items. 
Conflicts:
	code/defines/obj/weapon.dm
 2014-06-20 12:11:13 -04:00
Chinsky
21eae55515 Nextgen lights #3: Fire 
Fire now emites colored light, pretty rad.
 2014-06-20 12:08:52 -04:00
Chinsky
e14c19f457 Changed color mixing to use weighted average instead of addition. Should help against values reaching FF too fast. 
Adjusted color mixing helper to use inbuilt procs.
 2014-06-20 12:08:30 -04:00
Chinsky
d8d0b317e0 Shortened helper. 
Added new helper for alternative mixing.
 2014-06-20 12:07:57 -04:00
Chinsky
fc76ac01e0 Nextgen lighting #2: Lights 
Can paint light tubes and bulbs with paint and stick in sockets to get colored lights.
 2014-06-20 12:07:46 -04:00
Chinsky
3fa03af4cb Changes paint tile coloring to use color var, less icon procs. 2014-06-20 12:07:34 -04:00
Chinsky
5a85ac8c9f Nextgen lights #1: supermatter 
Now it glows with yellowish tint, getting brighter as damage level rise.

Conflicts:
	code/modules/supermatter/supermatter.dm
 2014-06-20 12:07:11 -04:00
Chinsky
91e2bcda9c Made lights look fancier with blend modes 
Conflicts:
	icons/effects/effects.dmi
 2014-06-20 12:00:16 -04:00
Chinsky
1abe52befd Shortened helper procs a little. 2014-06-20 11:59:50 -04:00
Chinsky
4fe111bcdc Got vgstation13 colored lights rewrite working here. 
Conflicts:
	code/__HELPERS/game.dm
	code/__HELPERS/logging.dm
	code/controllers/_DynamicAreaLighting_TG.dm
	icons/effects/effects.dmi
 2014-06-20 11:59:38 -04:00
ZomgPonies
7f7462e577 Runtime fixes, try to fix speech breaking? 2014-06-20 10:33:00 -04:00
ZomgPonies
53ac0c4c79 Merge pull request #267 from Bone-White/master 
Vox clone scanner and NO_SCAN fix
 2014-06-20 10:00:42 -04:00
ZomgPonies
2b0d586281 Made it so if a bug report or question comes in and there's noone with the right flag on, it gets sent to anyone with r_admin instead. 2014-06-20 09:50:48 -04:00
Bone White
61578a5880 Vox able to be cloned fix (2) 
Minor syntax fix
 2014-06-20 14:10:40 +01:00
Loganbacca
a72d2824dc New vehicle loading code 
Conflicts:
	code/modules/mob/mob.dm
	code/modules/mob/mob_movement.dm
 2014-06-20 09:01:00 -04:00
Loganbacca
4924324dbf Potential new sprite 2014-06-20 08:51:49 -04:00
Cael Aislinn
5e02cedf46 switched autocloner and replicator artifacts over to a timer system, made replicator use materials to create items (materials can be anything) 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2014-06-20 08:48:31 -04:00
Cael Aislinn
c23cb7afef rework talking items and re-enable them, made xenoarch boxes have a variable internal size, added three new eldritch xenoarch finds (poltergeist mask, vampiric statuette, endless replenishing container) 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>

Conflicts:
	code/modules/research/xenoarchaeology/finds/finds_defines.dm
 2014-06-20 08:47:51 -04:00
Cael Aislinn
dbce0f457f harvester can now harvest artifact's secondary effect, which effect it chooses is determined by which are active (if both are active it can harvest neither) 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2014-06-20 08:17:01 -04:00
Cael Aislinn
18d5053e5b miscellaneous fixes to various anomaly utiliser effects involving location/holder issues, fixed anomaly harvester runtime, reworks anomaly utiliser to be a lot easier/nicer to use, balance tweaks: 
- caps stun effect values for pulsing
- sets max utiliser battery charge to 300 (30 sec)
- changes energy consumption for utiliser pulse effects to "effect max charge level" * "effect range" ^ 2
- changes energy consumption for utiliser touch effects to 100 (10 sec worth of consumption)

Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2014-06-20 08:16:40 -04:00
Cael Aislinn
2082789543 moved xenoarchaeology master controller code into a separate file 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>

Conflicts:
	code/modules/research/xenoarchaeology/misc.dm
 2014-06-20 08:16:30 -04:00
Cael Aislinn
5439b04241 reconstitutor has a chance to extract multiple genomes per fossil (50% for two genomes, 37.5% chance for three genomes), moved xenoarchaeology initialisation code into the master controller, added upper and lower spawn vals for digsite turf number and artifact machine number, added circuitboards for the reconstitutors, fixes missing clonepod for flora reconstitutors 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>

Conflicts:
	code/global.dm
	code/modules/mining/mine_turfs.dm
	code/modules/research/xenoarchaeology/misc.dm
 2014-06-20 08:13:42 -04:00
ZomgPonies
29a21e5c6f Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-06-20 08:09:05 -04:00
mwerezak
3f6b32b15b Fixes #5186 2014-06-20 08:05:09 -04:00
Bone White
c533429c94 Vox able to be cloned fix 
Should make the dna scanner not scan vox dna (or anything with the
NO_SCAN flag).
 2014-06-20 12:55:16 +01:00
ZomgPonies
c322842381 Merge pull request #265 from Regen1/Small-fixes 
Small fixes
 2014-06-20 07:50:11 -04:00
Regen
cb45350027 More brits 2014-06-20 13:46:49 +02:00
Regen
20f410f86e Fixed brits being bad at coding 2014-06-20 13:43:30 +02:00
ZomgPonies
900c130f7f Ambassador karma unlocks 2014-06-20 07:22:02 -04:00
ZomgPonies
ff87585d57 Traitor panel only for madmins 2014-06-20 05:13:47 -04:00
ZomgPonies
713a769fa7 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-06-20 05:09:04 -04:00
ZomgPonies
a5c68a80c3 Fixing +MOD permissions and awho 2014-06-20 05:08:51 -04:00
ZomgPonies
c3004f5756 Ahelp category adminpm bugfix 2014-06-20 04:44:35 -04:00
alex-gh
6e2ef67086 Merge pull request #264 from alex-gh/posarg_runtime_fix 
Melee runtime fix
 2014-06-20 01:39:37 +02:00
alex-gh
c98c3ce909 Melee runtime fix 
Fixes "positional parameters must precede all named args" runtime.
 2014-06-20 01:35:47 +02:00
ZomgPonies
c693419a14 Mod + Admin dsay fix 2014-06-19 19:34:05 -04:00
ZomgPonies
529667a1a1 Remove that from admin verbs. 2014-06-19 19:25:04 -04:00
ZomgPonies
8c4c889dd6 Fix ahelp sound toggle option 2014-06-19 19:24:23 -04:00
ZomgPonies
ea26d37fde Quick fix for PM colors 2014-06-19 19:21:15 -04:00
ZomgPonies
a8b755da1a Version 1 of the ahelp overhaul 2014-06-19 19:18:50 -04:00
ZomgPonies
3f0f5b0327 Fun removal commitee was unanimous 2014-06-19 17:51:51 -04:00
ZomgPonies
1bf4d485a4 Derp 2014-06-19 16:53:15 -04:00
ZomgPonies
9700a8e54b Fart sound. 2014-06-19 16:37:59 -04:00
ZomgPonies
ae618ec644 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-06-19 15:25:38 -04:00
ZomgPonies
8b77070cbe Added new minerals and sprites to mining 2014-06-19 15:24:03 -04:00
Necaladun
bef546bb7b 3rd times the charm - trinary 
Changed to :5 because :t was conflicting with something to do with
radio?
 2014-06-20 04:15:15 +09:30
ESwordTheCat
d17486b635 Revert it to this. 2014-06-19 10:34:26 -04:00
ESwordTheCat
d81d1736fc Remove spawn. 2014-06-19 10:34:14 -04:00
ESwordTheCat
bb54ac1ac4 Fix artifact spreading and large scanner. Remove extra list used the master_controller var again. 
Conflicts:
	code/modules/mining/mine_turfs.dm
	code/modules/research/xenoarchaeology/misc.dm
	code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm
 2014-06-19 10:33:50 -04:00
Jarcolr
4f20de625c Fixes #5255 and walking over edges 
Before walking over an asteroid edge would have put the mob under the
sprite, as if the mob crawled under it.
 2014-06-19 10:14:35 -04:00