cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-25 09:41:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,605 Commits 26 Branches 2 Tags
fa6655c1908134f792b5890b28dd67d24a9cfad6
Commit Graph

214 Commits

Author SHA1 Message Date
ZomgPonies
3633c2dcb7 Fixed some broken flags 2014-01-29 23:31:22 -05:00
Zuhayr
8c5ad54e0f Recommitting a ton of files as one commit due to needing to reset this repo to an earlier point in the log. Full changes in PR. 
Conflicts:
	code/game/objects/items/weapons/implants/implant.dm
	code/modules/admin/verbs/vox_raiders.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/diona.dm
	code/modules/mob/living/carbon/species.dm
 2014-01-28 15:30:20 -05:00
ZomgPonies
7014f6f83e More fixes to text2speech 2014-01-27 16:58:52 -05:00
ZomgPonies
808143f976 Final text2voice commit 2014-01-27 13:03:25 -05:00
Rob Nelson
559700a58b Added a bunch of new goon powers. 
Conflicts:
	code/modules/mob/living/carbon/human/emote.dm
 2014-01-26 14:48:33 -05:00
Rob Nelson
7892eeb7cc Standardize LASER, NOCLONE, and HUSK 
Conflicts:
	code/game/gamemodes/changeling/changeling_powers.dm
	code/modules/mob/living/carbon/human/death.dm
	maps/RandomZLevels/wildwest.dm
 2014-01-21 22:59:53 -05:00
Rob Nelson
f44ff1d7aa Standardize FAT 
Conflicts:
	code/modules/client/preferences.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/simple_animal/constructs.dm
	code/modules/mob/mob.dm
	code/modules/mob/mob_grab.dm
 2014-01-21 22:57:10 -05:00
Rob Nelson
d49e6d3bf4 Standardize CLUMSY 
Conflicts:
	code/game/jobs/job/civilian.dm
	code/game/objects/items/weapons/defib.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/modules/mob/living/silicon/robot/component.dm
	code/modules/reagents/reagent_containers/syringes.dm
 2014-01-21 22:49:22 -05:00
Rob Nelson
22a2df1115 Standardize HULK. 
Conflicts:
	code/game/mecha/mecha.dm
	code/game/objects/items/weapons/swords_axes_etc.dm
 2014-01-21 22:45:40 -05:00
Rob Nelson
dd8c8c12ab Standardize XRAY. 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	maps/RandomZLevels/wildwest.dm
 2014-01-21 22:37:37 -05:00
Rob Nelson
95cc6a27b5 Standardize mutation constants, remove ambiguity, remove non-implemented muts. 
Conflicts:
	code/_onclick/click.dm
	code/game/dna/genes/powers.dm
	code/game/machinery/wishgranter.dm
	code/modules/mob/living/carbon/alien/alien.dm
	code/modules/mob/living/carbon/alien/humanoid/life.dm
	code/modules/mob/living/carbon/alien/larva/life.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_movement.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/living/damage_procs.dm
	code/modules/mob/living/living.dm
	code/modules/power/lighting.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/setup.dm
	maps/RandomZLevels/wildwest.dm
 2014-01-21 22:36:19 -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
b5a1eff678 Add ghost radio 
Conflicts:
	code/modules/client/preferences.dm
	code/world.dm
 2014-01-17 13:10:00 -05:00
ZomgPonies
4f405f2ed7 A few numbers change for reagents 2014-01-11 01:51:31 -05:00
Zuhayr
f9b8c01c65 Implemented IS_SLOW. 2014-01-07 00:01:52 -05:00
Zuhayr
e09a00fe0e Fixed a duplicate definition bug with WHITELISTED. 
Conflicts:
	code/modules/client/preferences.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/new_player/new_player.dm
	code/setup.dm
 2014-01-06 23:59:21 -05:00
Zuhayr
2c677b2e48 Reusing some unused flags in species. 
Conflicts:
	code/setup.dm
 2014-01-06 23:35:14 -05:00
ZomgPonies
af92092f64 Fixed Slimaggedon spawning -- Uses antag menu 2014-01-04 22:11:16 -05:00
Nanai
bf9ba0f658 Added and Adjusted Chemicals 
Fixes with the changes of eyes to internal organs with Imidazoline and the surgery.

New chemicals:
Peridaxon, Potassium Chloride, and Potassium Chlorophoride. Peridaxon: Internal organ healing chemical; 2Bicard+2Clonex(plasma catalyst). Potassium Chloride: Stops hearts for medical in overdose; Salt+Potassium, Potassium Chlorophoride: Stops hearts right proper; PotassiumChloride+Plasma+Chloral Hydrate.

Chloral Hydrate and Soporific changes
Made chloral hydrate less instakill(nerfed), but a toxic dropper without blackscreen. Soporific buffed, but less blackscreen sleeping applied.

Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm
	code/setup.dm
 2014-01-04 15:59:22 -05:00
ZomgPonies
3a88f33e0c Fixed up and re-added powerarmor 2013-12-28 17:21:25 -05:00
ZomgPonies
58afd403a9 Moving some defines over to setup 2013-12-28 08:58:12 -05:00
ZomgPonies
21666af24d Organ/Surgery Overhaul Part 2 2013-12-19 08:59:02 -05:00
ZomgPonies
87c56b4b23 Vampire commit 2 2013-12-14 05:19:54 -05:00
ZomgPonies
912601a30d Vampire Gamemode! 2013-12-13 19:38:49 -05:00
ZomgPonies
82104d9565 New Security Levels 2013-11-26 03:22:12 -05:00
ZomgPonies
227f4a1bc0 I guess slime people are now live. 2013-11-24 09:48:38 -05:00
ZomgPonies
29114f7bb3 Added appearance bans granularity option 2013-11-24 02:47:56 -05:00
ZomgPonies
0e201cc4a5 Going back to BS12 ZAS, permanently 2013-11-08 09:51:22 -05:00
ZomgPonies
0227baa319 Reverting ZAS back to /vg/ style 2013-11-07 07:13:27 -05:00
ZomgPonies
e4a82dfda8 ZAS switched from /vg/ to BS12 2013-11-06 20:21:59 -05:00
ZomgPonies
36c7fa3dcd computer3 merge 2013-11-03 14:18:54 -05:00
ZomgPonies
00b101d7f2 Seperated ID and PDA slots 2013-11-01 13:28:58 -04:00
ZomgPonies
6a073828f5 Slime people commits 2013-10-21 05:25:37 -04:00
ZomgPonies
b01b0c962f Slime people species 2013-10-20 20:19:05 -04:00
ZomgPonies
5daf979b72 Pretty much all new click code 2013-10-12 14:44:36 -04:00
ZomgPonies
771de60525 Optimizations and bugfixes galore 2013-10-08 10:32:47 -04:00
ZomgPonies
aa79d1323b Added Vox and Kidan as unlockable Karma species 2013-10-04 02:57:42 -04:00
ZomgPonies
f841903433 Antmen buff 2013-09-30 01:14:25 -04:00
ZomgPonies
e2826f3675 New Vox gamemode -- Trade 2013-09-28 20:42:32 -04:00
ZomgPonies
78f14f11cc New vending machine, enabling Ian clothes, bug fixes, map update 2013-09-28 01:38:18 -04:00
ZomgPonies
fcbdb53bbb Bunch of FAT fixes 2013-09-24 19:00:40 -04:00
ZomgPonies
c1222034ee BS12 -> Ponies merge 2013-09-09 10:51:16 -04:00
Mloc-Argent
a084f74c7d Expansion of every "icon = ''" path. 
Supposed to help compilation times.  Who knows.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-09-01 21:53:36 +01:00
Zuhayr
e10a433800 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-08-14 01:01:18 -07:00
Zuhayr
254cef453a Added a preferences switch for diona. 2013-08-13 14:16:07 -07:00
Zuhayr
6e81952c20 Moved language flag defines to setup.dm. 2013-08-10 21:00:32 -07:00
Zuhayr
e9a1272d34 Moved species defines to setup.dm, add whitelisted species global. 2013-08-07 01:12:11 -07:00
Zuhayr
e16d06d469 Merged setup.dm. 2013-07-28 08:46:10 -07:00
Zuhayr
0c88896adf Adds a vox heist game mode. Fairly complex. 2013-07-28 05:18:04 -07:00
Segrain
47db87fcfe Cameras for strike teams. 2013-07-28 01:59:03 +03:00