cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-04-30 12:02:09 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,199 Commits 11 Branches 2 Tags
355666e1a825252a4d08fa4e5cfced85e107ce39
Commit Graph

9304 Commits

Author SHA1 Message Date
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
Rob Nelson
1b2d09bb2d More fixings. 
Conflicts:
	code/game/machinery/computer/medical.dm
 2014-01-20 01:09:03 -05:00
Rob Nelson
dae08eb061 Add back in /fail/station's DNA dickery panel, fix missing block shifting. 
Conflicts:
	code/modules/admin/verbs/debug.dm
 2014-01-20 01:03:42 -05:00
Rob Nelson
688ed60a44 DNA Modifier works perfectly. Code cleanup. 
Conflicts:
	code/game/dna/dna_modifier.dm
 2014-01-20 01:02:16 -05:00
Rob Nelson
3c5dd233a6 Clean up code, fix appearance randomization. 2014-01-20 01:00:10 -05:00
Rob Nelson
04ab4903c6 Add DNA2 difficulties. 
Conflicts:
	code/game/dna/dna2.dm
	code/game/gamemodes/setupgame.dm
 2014-01-20 00:59:53 -05:00
Rob Nelson
268836dd33 DNA modifier running again: Fix shitty defer logic, comment out debugging. 
Conflicts:
	code/game/dna/dna2.dm
 2014-01-20 00:58:24 -05:00
Rob Nelson
7573985069 Additional debugging. Switching to Bleeding to make a fix. 2014-01-20 00:55:26 -05:00
Rob Nelson
775691e244 Debugging. 2014-01-20 00:55:13 -05:00
Rob Nelson
dc60cc1726 DNA modifiers work now. 
Conflicts:
	code/defines/obj/hydro.dm
	code/game/machinery/cloning.dm
	code/game/machinery/hydroponics.dm
	code/modules/mob/living/carbon/zombie/zombie.dm
	code/modules/mob/transform_procs.dm
 2014-01-20 00:54:46 -05:00
Rob Nelson
4a8ca0a7d4 Now tested up to character join. 2014-01-20 00:44:10 -05:00
Rob Nelson
db21525feb SAY HELO TO DNA2, N3X15'S AWFUL FUCKING RECODE OF DNA 
Conflicts:
	baystation12.dme
	code/game/gamemodes/setupgame.dm
	code/game/objects/items/weapons/dna_injector.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_defines.dm
	code/modules/mob/new_player/new_player.dm
 2014-01-20 00:43:19 -05:00
d3athrow
266c80a764 sanity checking to resolve runtimes 2014-01-19 23:59:26 -05:00
Cheridan
7e05047ab5 Husking someone as a changeling will now display the victim's notes. 
Conflicts:
	code/game/gamemodes/changeling/changeling_powers.dm
 2014-01-19 21:38:22 -05:00
Pete Goodfellow
331cf1df95 Updated all suicide_act()s to use a new span class, 'suicide'. 
Conflicts:
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/weapons/melee/energy.dm
	code/game/objects/items/weapons/melee/misc.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/objects/items/weapons/weaponry.dm
	code/modules/hydroponics/growninedible.dm
	code/modules/hydroponics/hydroitemdefines.dm
	code/modules/surgery/tools.dm
	code/stylesheet.dm
 2014-01-19 21:25:47 -05:00
ZomgPonies
11f32fba24 Nerfed amount of spiders 2014-01-19 21:01:07 -05:00
ZomgPonies
65d023dd93 Facehugger to Full alien, all player controlled 2014-01-19 16:45:20 -05:00
ZomgPonies
90496be20a Standardized intent names so it's all harm. Fuck you hurt. 2014-01-19 08:30:50 -05:00
Glloyd
085de1b71c Resolves #2213 Fixes the back icons for the scythe and the Roman shield. 
Conflicts:
	icons/mob/back.dmi
 2014-01-19 05:32:34 -05:00
Rob Nelson
cd2c20a6fe NEW BOO SYSTEM! 
Conflicts:
	code/datums/spell.dm
	code/modules/mob/dead/observer/observer.dm
 2014-01-19 05:22:20 -05:00
SamCroswell
d498adb324 Ninja / CentComm changes 2014-01-18 00:34:24 -05:00
Rob Nelson
985f164541 Add "Die a glorious death" objective. 2014-01-17 13:03:30 -05:00
Furlucis
d7bb62fc90 Tweaks homunculi 
Makes them a bit creepier, and makes it so they don't spawn with
underwear. Because really, if the rune spawns anything, it should be
robes. But that would make things too easy.
 2014-01-17 08:57:41 -05:00
Aranclanos
eb76256f04 Adds the captain's medal to the medal's lockbox. 
Fixes issue 2358

Conflicts:
	code/game/objects/items/weapons/storage/lockbox.dm
 2014-01-16 21:55:00 -05:00
ZomgPonies
48403dcc8e A lot of fixing up job preferences. 2014-01-16 09:18:49 -05:00
ZomgPonies
2525a3d057 Added barber karma job 2014-01-16 08:42:36 -05:00
ZomgPonies
6dbf776ff4 Gamme to shuttle, part two 2014-01-16 06:57:17 -05:00
ZomgPonies
031f67110b Fixes some sounds 2014-01-16 05:23:32 -05:00
ZomgPonies
90909b304a Merge pull request #116 from SamCroswell/master 
EXTREMELY buggy Ninja code
 2014-01-16 01:52:19 -08:00
d3athrow
c8ceab5aa2 Adds Randomized Character Slot, if enabled picks a random populated character slot to use upon round start. Does not affect late joins for now. 
Conflicts:
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	html/changelog.html
 2014-01-16 00:48:24 -05:00
ZomgPonies
b80552169c Stupid type 2014-01-15 13:13:13 -05:00
ZomgPonies
42f286f210 Fixing Gamma armory exploits 2014-01-15 13:06:47 -05:00
ZomgPonies
3a540cbbce Forgot one 2014-01-15 01:54:21 -05:00
Mark Aherne (Faerdan)
c1c49fe6d8 Canister, Tank & Tank Transfer Value NanoUIs. 
* Added Canister, Tank & Tank Transfer Value NanoUIs.

Conflicts:
	code/game/machinery/atmoalter/canister.dm
	nano/css/shared.css
 2014-01-15 01:53:51 -05:00