cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-08 08:31:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,475 Commits 26 Branches 2 Tags
cb5367ed96b2037fc299cb4f7af6e4d72ebff7ff
Commit Graph

11692 Commits

Author SHA1 Message Date
ZomgPonies
cb5367ed96 Switching cable coils to stacks 2014-01-21 21:23:26 -05:00
Razharas
8f71ea55e3 Added tools and time handling 
Well yeah
 2014-01-21 21:05:50 -05:00
Razharas
56e56b31a6 Implemented crude crafting 
Debug messages are still inside, pushing only cozx pete asked me to

Conflicts:
	code/_globalvars/lists/objects.dm
	code/game/objects/structures/tables_racks.dm
 2014-01-21 21:05:42 -05:00
ZomgPonies
9fb2bcd473 Merge pull request #122 from Regen1/master 
Added new Fluff sprite from Wisewill
 2014-01-21 13:24:16 -08:00
Regen
6927592524 Fix 2014-01-21 22:19:29 +01:00
Regen
0e6b3fb165 Added new Fluff sprite 
Black schoolgirl uniform, made my Wisewill~
 2014-01-21 22:14:25 +01:00
Rob Nelson
460621bf97 Sober gene implementation 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
 2014-01-21 14:39:32 -05:00
Rob Nelson
32c6268b59 Implement psy-resist block (and fix some naughty remoteview behavior). 2014-01-21 14:36:12 -05:00
Rob Nelson
57dc0ddd50 Implement toxic farts. 
Conflicts:
	code/game/objects/effects/effect_system.dm
	code/modules/mob/living/carbon/human/human_defines.dm
 2014-01-21 14:35:15 -05:00
Rob Nelson
6091d16262 DNA panel fixed, update changelog. 
Conflicts:
	html/changelog.html
 2014-01-20 11:43:07 -05:00
Rob Nelson
044d6a79cb Fix monkey UI appends not being completed for DNA2. 
Conflicts:
	code/modules/mob/living/carbon/monkey/monkey.dm
 2014-01-20 05:14:38 -05:00
Rob Nelson
da78332256 Fix monkey genes. 
Conflicts:
	code/modules/mob/living/carbon/monkey/monkey.dm
	html/changelog.html
 2014-01-20 05:06:19 -05:00
ZomgPonies
4261fa0ae4 Missed a spot 2014-01-20 04:11:31 -05:00
ZomgPonies
bb853093c1 Intercom runtime fix 2014-01-20 04:05:29 -05:00
ZomgPonies
c033a83316 Fixing my DNA2 fuckups 2014-01-20 03:43:06 -05:00
ZomgPonies
fe0a3a2dcd Fixing Genetics 2014-01-20 03:31:25 -05:00
Rob Nelson
1c8c96a9eb Fix hallucination gene. 2014-01-20 03:29:09 -05:00
Rob Nelson
ace34c60b0 DNA2: New powers from Paradise's release of Goon's genetic code. Also added lisp disability. 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/say.dm
	html/changelog.html
 2014-01-20 02:10:58 -05:00
Rob Nelson
fbabcb9117 Add missing files. 2014-01-20 02:04:15 -05:00
Rob Nelson
520a2cd401 NanoUI changes from Faerdan 
Conflicts:
	code/game/dna/dna_modifier.dm
	code/game/machinery/cryo.dm
	code/modules/nano/nanomanager.dm
	code/modules/nano/nanoui.dm
	code/modules/reagents/Chemistry-Machinery.dm
 2014-01-20 02:02:31 -05:00
Rob Nelson
d31bc9def9 UI fix from Ccomp5950 2014-01-20 01:59:51 -05:00
Rob Nelson
ff2d37265c Screw around with gene logic. 
Conflicts:
	code/game/dna/dna2_domutcheck.dm
 2014-01-20 01:59:31 -05:00
d3athrow
b6045a2bbe Fix move_inside verb exploit across the board 
Conflicts:
	code/game/machinery/Sleeper.dm
 2014-01-20 01:58:03 -05:00
Rob Nelson
dc5a4a8a84 Fix beaker being ejected with occupant. 2014-01-20 01:55:12 -05:00
Rob Nelson
fe2f161be2 Fix for issue #309 2014-01-20 01:54:58 -05:00
Rob Nelson
a04324baef Fix more by-ref issues in DNA 
Conflicts:
	code/game/machinery/hydroponics.dm
 2014-01-20 01:54:33 -05:00
Rob Nelson
36b967d962 I am double-stupid. Thanks to Zuhayr and Chinsky for pointing this out. 
Conflicts:
	html/changelog.html
 2014-01-20 01:53:41 -05:00
d3athrow
f81e616f21 lazy setSEstate workaround 2014-01-20 01:53:17 -05:00
d3athrow
211d1bfdbe Fix not being able to change the buffer label 2014-01-20 01:53:06 -05:00
Rob Nelson
9e956b63ee Fix getting "monkey(666)" instead of "Jebediah Jenkins" when dicking with DNA. 2014-01-20 01:52:47 -05:00
Rob Nelson
7456592afa I am fucking stupid. 2014-01-20 01:52:36 -05:00
Rob Nelson
5f89171fc1 Hopefully fix all DNA corruption issues caused by assuming datum pass by-val. 
Conflicts:
	code/modules/mob/transform_procs.dm
 2014-01-20 01:52:08 -05:00
Rob Nelson
c349f761d9 Fixes for DNA2, again, 2014-01-20 01:50:56 -05:00
Rob Nelson
2f7551cfe1 Now it's fixed. 2014-01-20 01:50:46 -05:00
Rob Nelson
acdca28e51 Fix for DNA modifier transfer buffers. 2014-01-20 01:50:10 -05:00
Rob Nelson
20bc568131 Fix DNA injectors breaking shit. 
Conflicts:
	code/game/dna/dna2_helpers.dm
 2014-01-20 01:49:49 -05:00
Rob Nelson
6fe47cfc51 Standardize buffers on all DNA machines in an attempt to fix DNA modifiers. WILL BREAK SHIT 
Conflicts:
	code/game/machinery/computer/cloning.dm
	code/game/objects/items/weapons/dna_injector.dm
 2014-01-20 01:48:57 -05:00
Rob Nelson
0e32d72fc2 Fixes #3, hopefully. 2014-01-20 01:43:27 -05:00
Rob Nelson
a19a99338b I am fucking dumb. Fixes #2. 2014-01-20 01:43:16 -05:00
Rob Nelson
10ada3abe7 Setting connected in gene.activate() might help with all these DNA modifier glitches. 2014-01-20 01:42:13 -05:00
Rob Nelson
665cfdc763 Fix some DNA modifier NPEs. 2014-01-20 01:42:01 -05:00
Rob Nelson
4008b936bc DNA fixins. 2014-01-20 01:41:50 -05:00
Rob Nelson
a0e52776d8 Fix some domutcheck NPEs. 2014-01-20 01:41:36 -05:00
Rob Nelson
448ea1f02c Less debug spam 2014-01-20 01:41:25 -05:00
Rob Nelson
fd6cc3e458 HA HA NEW GENE HANDLING 
Also fixed block injector crash.

Conflicts:
	code/game/dna.dm
	code/modules/mob/living/carbon/monkey/monkey.dm
	html/changelog.html
 2014-01-20 01:41:03 -05:00
Rob Nelson
399cecfca9 Fixes. 
Conflicts:
	code/game/dna/genes/powers.dm
 2014-01-20 01:36:56 -05:00
Rob Nelson
b15d0213ac Finish rewrite of domutcheck. Time to test this bitch. 
Conflicts:
	code/game/gamemodes/setupgame.dm
 2014-01-20 01:35:56 -05:00
Rob Nelson
8327330cb9 Integrate new gene handling. 
Conflicts:
	code/game/dna/dna2_helpers.dm
	code/game/dna/genes/powers.dm
 2014-01-20 01:28:16 -05:00
Rob Nelson
1ba0db4f9a Stash 
Conflicts:
	code/game/dna/dna_modifier.dm
	tools/OpenBYOND
 2014-01-20 01:18:59 -05:00
Rob Nelson
450a5dec8e Start wrapping up the new domutcheck logic 
Conflicts:
	code/game/dna/dna2_helpers.dm
	code/modules/mob/mob_defines.dm
 2014-01-20 01:15:15 -05:00