cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-06 23:51:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,279 Commits 26 Branches 2 Tags
fdf3c669f84e27ff442c095456225e266d7eb3af
Commit Graph

7069 Commits

Author SHA1 Message Date
suethecake
fdf3c669f8 Fixes small issues in save files. 2014-04-29 14:08:56 -04:00
suethecake
aa33563ba7 Few bugfixes - namely species hair still having do coloration = 0 and the tail rendering over equipment. Tajaran and Unathi sprites are also now black to facilitate more vibrant colors. 
Trying to color them while dark green and brown-grey ended up in odd colorations. Quality of life change.

Conflicts:
	code/modules/mob/new_player/sprite_accessories.dm
	icons/mob/human_face.dmi
	icons/mob/human_races/r_def_tajaran.dmi
	icons/mob/human_races/r_tajaran.dmi
 2014-04-29 14:08:32 -04:00
suethecake
10b7a2e8d9 Initial commit containing all the necessary code files that allow Tajaran, Unathi, and Skrell to change both their hair and body color to match. NO MORE GREEN/GREY! 
Conflicts:
	code/modules/client/preferences.dm
	code/modules/mob/living/carbon/human/human_defines.dm
	code/modules/mob/living/carbon/species.dm
	code/setup.dm
 2014-04-29 13:58:56 -04:00
ESwordTheCat
33c492ae4c Fixed all the runtimes. 2014-04-29 13:39:50 -04:00
ESwordTheCat
2382984c03 Some optimization at object pooling, tinkering at beams.dm and reverting useless code. 
Conflicts:
	code/modules/projectiles/projectile/beams.dm
 2014-04-29 13:39:20 -04:00
ESwordTheCat
774a4407da Moar object pool. 
Conflicts:
	code/modules/projectiles/projectile.dm
	code/modules/projectiles/projectile/beams.dm
	code/modules/projectiles/projectile/bullets.dm
	code/modules/projectiles/projectile/special.dm
 2014-04-29 13:36:39 -04:00
ESwordTheCat
ebfcc9be79 Object pool for beam projectile, minor changes to object pool. 
Conflicts:
	code/WorkInProgress/Cael_Aislinn/Rust/gyrotron.dm
	code/WorkInProgress/Cael_Aislinn/Supermatter/ZeroPointLaser.dm
	code/game/objects/structures/grille.dm
	code/modules/power/singularity/emitter.dm
	code/modules/projectiles/projectile.dm
	code/modules/projectiles/projectile/beams.dm
 2014-04-29 13:33:06 -04:00
Rob Nelson
96d90dc28a Update with some bay optimizations for mobs. 
Conflicts:
	code/defines/obj.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/organs/blood.dm
	code/modules/organs/organ.dm
	code/modules/organs/organ_external.dm
	code/setup.dm
	compare_report.txt
 2014-04-28 21:29:14 -04:00
Mloc-Argent
fcdcef5931 human: move organ generation into a species proc 
New proc: /datum/species/create_organs
Called in set_species when no organs exist or it's forced.
Also shuffled set_species around a bit, adding a var to human/new to
specify a species to start as.
Should fix the adminspawn vox organ runtime.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/cloning.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/new_player/new_player.dm
	code/modules/organs/organ.dm
 2014-04-28 21:09:45 -04:00
paprka
f98cfc75ec final stuff 
Conflicts:
	code/modules/projectiles/guns/energy/special.dm
	icons/mob/back.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
 2014-04-28 20:36:56 -04:00
ZomgPonies
8abf352b2a Fixes cyborg laser + emp problem 2014-04-28 20:09:33 -04:00
DJSnapshot
ab58107286 Fixes for Mloc, part 2. 
Conflicts:
	code/game/objects/items/weapons/cigs_lighters.dm
 2014-04-28 19:15:17 -04:00
DJSnapshot
f0ca9c12ff fix for IPCs taking rad damage. 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
 2014-04-28 19:10:17 -04:00
Ccomp5950
13a72f4a04 Crash fix attempt: Moving NanoUI resource file sending away from client/New() 
it's going in mob/Login() instead.

Conflicts:
	code/modules/client/client procs.dm
	code/modules/mob/login.dm
 2014-04-28 18:51:57 -04:00
ZomgPonies
01bbf00d2c Ability to upgrade powercells in energy weapons 2014-04-27 18:20:59 -04:00
ZomgPonies
1ebe9f34e9 Solar fixes 2014-04-27 17:39:56 -04:00
ZomgPonies
25084e1c33 Fixed missing areas for a proper prisonbreak 2014-04-26 18:32:46 -04:00
alex-gh
02aab3f779 Temporary revert for the new say code. 2014-04-24 10:28:52 +02:00
alex-gh
780ab3a32b Added a random delay to mass hallucination announcement, made hallucinations more severe 2014-04-23 18:30:19 +02:00
alex-gh
a1e4591c5a Moved more destructive events later in the round 2014-04-23 18:26:45 +02:00
d3athrow
528ffcef1d Fixes a nano runtime when the oldMob is null during a user_transfer 
Conflicts:
	code/modules/nano/nanomanager.dm
 2014-04-23 11:48:14 -04:00
d3athrow
bd0354cf7d Fix not being able to open the playerpanel of aliens due to a runtime. 2014-04-23 11:45:07 -04:00
ZomgPonies
1cdbe818ad tg's solars update 2014-04-22 09:46:36 -04:00
ZomgPonies
1a4ab5c799 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-04-20 10:10:22 -04:00
Ccomp5950
2d34d142a7 Say code fixes. 
Lobby players won't hear stuffs
Universal hearing with animals won't be a thing.
Players won't hear stuff if they are sleeping, though somethings might slip through...

Conflicts:
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
	code/modules/mob/new_player/new_player.dm
 2014-04-20 09:30:18 -04:00
alex-gh
71151c0c57 Merge pull request #183 from alex-gh/event_area_rework 
Events can now strike all areas instead of few select ones
 2014-04-20 14:07:27 +02:00
alex-gh
8a9130026a Events can now strike all areas instead of few select ones 2014-04-20 14:04:15 +02:00
Mike
bf98751d8b Clean up check for item being equipped 
Moved some common code to item.dm. Someone should probably take a look
at get_equipped_items() in inventory.dm sometime in the future.
 2014-04-20 03:50:23 -04:00
Mike
6d8d253ad7 Prevent vox boots from enabling in player's hand 
Vox players can't "dig their claws into the flooring" when holding the
boots in their hand. When enabled, the boots can't be taken off until
disabled.
 2014-04-20 03:50:11 -04:00
Mike
9dbf6be429 Removed the now-redundant verb 
Less clutter for the object panel.

Conflicts:
	code/modules/clothing/shoes/magboots.dm
 2014-04-20 03:49:55 -04:00
Mike
79d530def8 Enabled action icon for magboots 
Conflicts:
	code/modules/clothing/shoes/magboots.dm
 2014-04-20 03:48:01 -04:00
ESwordTheCat
16d5d18e7c Revert from area to text. 
Conflicts:
	code/modules/power/power.dm
 2014-04-20 03:37:00 -04:00
ESwordTheCat
84c296e741 Use the experimental getArea. 
Conflicts:
	code/modules/power/power.dm
 2014-04-20 03:28:46 -04:00
ESwordTheCat
b332bc7dec Don't use get_area proc, introduce myArea variable. 
Conflicts:
	code/modules/power/power.dm
 2014-04-20 03:26:59 -04:00
ZomgPonies
f9a773c84d Fix smoke 2014-04-20 02:34:40 -04:00
ZomgPonies
4b1619ddf5 Fix for binary speak? 2014-04-19 22:14:08 -04:00
Rob Nelson
56d8ce28c8 Part 1 of economy rework: Spacecash refactor - See commit for full changelog. 
* Implements stacking and stack overlays
 * Simplified tiers of cash (1,10,100,500,1000, may remove 500)
 * Simplified API (dispense_cash, count_cash)

Conflicts:
	code/modules/admin/admin_verbs.dm
	code/modules/admin/verbs/debug.dm
	code/modules/economy/ATM.dm
 2014-04-19 20:47:41 -04:00
Rob Nelson
b34d436756 Fix jukebox formatting 2014-04-19 20:37:01 -04:00
ESwordTheCat
cb2ecbaa30 Reduce use of named arguments. 2014-04-19 20:36:47 -04:00
Rob Nelson
0221e5bdff Fix jukebox after hammering it :V 2014-04-19 20:33:35 -04:00
Rob Nelson
2389e9a778 Fix a bunch of jukebox issues, clean up UI a bit, add feedback, allow slapping it to reset if broken. 2014-04-19 20:33:22 -04:00
Duny
235d32999a Fix borgs not choosing an appareance 
Locks down cyborgs after they choose a module until they choose an
appareance, to prevent standard borgs with security modules and such
running around.

Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
 2014-04-19 20:32:58 -04:00
Rob Nelson
6d7040e735 A few remaining jukebox bugs 
Conflicts:
	code/modules/media/mediamanager.dm
 2014-04-19 20:21:44 -04:00
Rob Nelson
ac5fcf31a5 Autoplay after power restoration when emagged. 2014-04-19 20:03:33 -04:00
Rob Nelson
cf4b9f5e42 Emaggable jukebox. 2014-04-19 20:02:42 -04:00
ESwordTheCat
c43652b33a Okay shards converted to pool usage now. 
Conflicts:
	code/game/machinery/computer/arcade.dm
	code/game/machinery/doors/windowdoor.dm
	code/game/machinery/telecomms/traffic_control.dm
	code/game/objects/structures/displaycase.dm
	code/modules/mining/mine_turfs.dm
	code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
 2014-04-19 19:57:53 -04:00
ESwordTheCat
75b6f2a2dd return pool for plasma shards. 2014-04-19 19:42:29 -04:00
Rob Nelson
9227481a8a Standardize windows. 
Conflicts:
	code/WorkInProgress/buildmode.dm
	code/game/machinery/doors/airlock.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/weapons/twohanded.dm
	code/game/objects/structures/window.dm
	code/modules/mining/mine_items.dm
	code/modules/mob/living/carbon/metroid/metroid.dm
	code/modules/mob/living/simple_animal/constructs.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
 2014-04-19 19:36:33 -04:00
VelardAmakar
dc6f794368 Adds the ability to construct, destroy, and take apart bookcases. 
Bookcases can be built using 5 wood planks.
Bookcases can be destroyed using weapons(50HP).
Bookcases can be taken apart using a wrench.
 2014-04-19 19:13:33 -04:00
ESwordTheCat
a947775f2e Add missing lens. 
Conflicts:
	code/modules/mob/mob.dm
 2014-04-19 19:13:05 -04:00