cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-01 13:12:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,144 Commits 26 Branches 2 Tags
bc260b5c896bb03479e7a7c403dff308ce6205a6
Commit Graph

7542 Commits

Author SHA1 Message Date
mwerezak
bc260b5c89 Fixes #5299 2014-06-21 05:52:52 -04:00
ZomgPonies
768fb4a8bd Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-06-21 04:38:21 -04:00
ZomgPonies
fea9d8eda3 Switched verbs around, removed Fun tab, new Event tab for event coordinators 2014-06-21 04:37:50 -04:00
alex-gh
d75d335f9b Goddamn phoron in my plasma 2014-06-21 07:31:05 +02:00
alex-gh
e78c90e163 Fixed supermatter runtime by updating the file to the latest BS12 version 2014-06-21 06:38:19 +02:00
alex-gh
94cb658c26 Merge pull request #268 from alex-gh/small_fixes 
Fixed missing bracket
 2014-06-21 05:49:51 +02:00
ZomgPonies
4f4a6a7ef8 NO SHOW ANTAGONIST 4 U 2014-06-20 16:31:35 -04:00
alex-gh
538e18acb2 Fixed missing bracket 2014-06-20 21:27:51 +02:00
ZomgPonies
7805a61dab Made Admin Log only show up to senior admins (+SERVER) 2014-06-20 13:50:24 -04:00
mwerezak
b39abf59fa Spaceacillin cures infected organs 2014-06-20 12:18:19 -04:00
mwerezak
02572867e4 Tweaks wound infection a bit 
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
 2014-06-20 12:17:51 -04:00
mwerezak
ba08210cd7 Re-enables organ infections, adds wound infection 
Conflicts:
	code/game/atoms.dm
	code/modules/mob/living/carbon/carbon.dm
	code/setup.dm
 2014-06-20 12:14:19 -04:00
mwerezak
6d44eea078 Updates l_move_time to use world.time 2014-06-20 12:12:31 -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
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
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
ZomgPonies
7f7462e577 Runtime fixes, try to fix speech breaking? 2014-06-20 10:33:00 -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
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
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
mwerezak
428bf6d350 Adds supply shuttle docking controllers 
Conflicts:
	maps/tgstation2.dmm
 2014-06-19 10:13:48 -04:00
mwerezak
175c48240d Makes the supply shuttle process in a tighter loop 
Conflicts:
	code/game/supplyshuttle.dm
 2014-06-19 09:54:45 -04:00