cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-06 07:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,656 Commits 26 Branches 2 Tags
d7194e7ca0ba3fb32abdcddd8e58b3b4f39745e4
Commit Graph

6765 Commits

Author SHA1 Message Date
ZomgPonies
d7194e7ca0 Merge pull request #143 from SamCroswell/master 
Ninja HUD/Messneger Update
 2014-02-01 16:48:45 -08:00
SamCroswell
3b515d1899 Ninja HUD Implemented, Thanks Wisewill! 2014-02-01 19:36:00 -05:00
RKF45
02f177ca48 Diona roasts needs cooperation for acid 2014-02-01 19:22:40 -05:00
RKF45
c69ddf76ec Reintroducing the dough-based cooking system. 
Conflicts:
	code/modules/food/recipes_microwave.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
	icons/obj/food.dmi
 2014-02-01 19:22:22 -05:00
Loganbacca
c8f868669c Tail rendering fix 
Spotted this while working on collars code
Moved tail layer before hand layers, so tails don't render over held items
 2014-02-01 19:05:28 -05:00
Loganbacca
7918053159 Cleaned collar rendering code 
Removed colon
Removed need for collar variable
Corrected TOTAL_LAYERS define

Conflicts:
	code/modules/mob/living/carbon/human/update_icons.dm
 2014-02-01 19:05:12 -05:00
Loganbacca
695726b36f Suit collars 
Adds a collar overlay above the helmet layer if the suit has one
Suit needs an identically named sprite in icons/mob/collar.dmi
Suit also needs 'collar = 1' set in utility.dm

Trenchcoats are go!

Conflicts:
	code/modules/mob/living/carbon/human/update_icons.dm
 2014-02-01 19:03:39 -05:00
Ccomp5950
706214f57c Deadchat sanitized so players can't use HTML. 2014-02-01 18:40:27 -05:00
Loganbacca
6f655a1686 Added underwear rendering to character setup screen 
Also culled unused underwear names from global_lists.dm

Conflicts:
	code/modules/mob/new_player/preferences_setup.dm
 2014-02-01 18:34:49 -05:00
Ergovisavi
311528762c Walking mushrooms will inherit some of the original properties of the food item that they were spawned from. 
Walking shrooms with ckeys will not gain levels, unlike wild ones, to keep things from getting silly.
 2014-02-01 05:30:44 -05:00
Ergovisavi
56c703ed6f Expanded on walking mushroom fights. Walking mushrooms now all have different colored caps, and you can save them from being eaten by feeding them a mushroom so they can live to fight another day. 
Conflicts:
	icons/mob/animal.dmi
 2014-02-01 05:30:23 -05:00
Ergovisavi
f85ac1af63 Walking mushrooms will now hunt and eat eachother, growing stronger when they do! The stronger they get, the better the quality of the mushroom slices you can butcher out of them! Don't smack em yourself though, or you'll bruise them, and they won't get stronger from being eaten. 
Conflicts:
	baystation12.dme
	code/modules/mob/living/simple_animal/friendly/mushroom.dm
 2014-02-01 05:27:59 -05:00
ZomgPonies
883420c665 Fixed decapitated being still alive 2014-02-01 05:01:15 -05:00
Rob Nelson
438e84c301 Different method of pAI/Posibrain recruiting. 
Conflicts:
	code/modules/mob/living/carbon/brain/posibrain.dm
	code/modules/mob/living/silicon/pai/recruit.dm
	html/changelog.html
 2014-02-01 03:00:26 -05:00
ZomgPonies
94e3a312cb Merge pull request #141 from alex-gh/vending_event_rebalanced 
Lowered the vending machine explosion radius, added lag mitigation
 2014-01-31 19:26:39 -08:00
ZomgPonies
5e6b366ce4 Merge pull request #142 from alex-gh/dynamic_event_tweak 
Dynamic event tweaks
 2014-01-31 19:26:28 -08:00
ZomgPonies
c9b19f5f24 Fix skeleton flags 2014-01-31 22:26:10 -05:00
alex-gh
f6b16135f9 Added biomass random event 2014-01-31 18:14:26 +01:00
alex-gh
a420307065 tweaked dynamic event probablilities, removed broken money hacker event for now 2014-01-31 18:03:27 +01:00
alex-gh
c435c4bc19 Lowered the vending machine explosion radius, added lag mitigation 2014-01-31 17:40:21 +01:00
ZomgPonies
1b1cf1900d Merge pull request #140 from Fox-McCloud/Revert-Brain-Damage 
Revert brain damage
 2014-01-30 23:57:09 -08:00
ZomgPonies
0445af4196 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-01-31 02:51:21 -05:00
Fox-McCloud
34185330f1 Reverts Brain damage factor 
Reverts brain damage factoring into health for future potential plans.
 2014-01-31 02:50:19 -05:00
Jordie0608
7ab1aac59e Outright removed toggle admin jump,spawn and revive buttons 
Conflicts:
	code/controllers/configuration.dm
	code/modules/admin/admin_verbs.dm
	code/modules/admin/topic.dm
 2014-01-31 02:47:04 -05:00
ZomgPonies
88ee7313b5 Merge pull request #139 from SamCroswell/master 
Additional Select Equiptment Option, More Areas
 2014-01-30 23:46:47 -08:00
Jordie0608
0be041991b totally didn't forget about this, no siree 
Conflicts:
	code/modules/admin/admin_verbs.dm
 2014-01-31 02:44:25 -05:00
Jordie0608
76cf20b458 Commented out toggle admin-jump button 2014-01-31 02:43:00 -05:00
Rob Nelson
6e1ddf8eac Missed a qdel in narsie. 2014-01-31 02:35:10 -05:00
Rob Nelson
ec70d13056 SINGULOTH OPTIMIZATIONS - See full commit for details. 
* qdel() instead of del(), wherever possible.
* Optimized gravpull logic
* /atom/movables can override canSingulothPull() logic to add gravpull exceptions (unless singuloth is 2fat)
* assigned_role energy boosts changed into a switch() statement

Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/mob.dm
	code/modules/power/singularity/singularity.dm
 2014-01-31 02:34:39 -05:00
SamCroswell
81cb2246f3 Ninja hoods can no longer slip off their head. Derp. 2014-01-30 22:56:29 -05:00
Rob Nelson
c3b021e246 Added a garbage collector implementation based on rumors from Goon and proc references in released gooncode. 
And holy shit it's fast

Conflicts:
	baystation12.dme
	code/ATMOSPHERICS/pipes.dm
	code/game/machinery/Sleeper.dm
	code/game/machinery/rechargestation.dm
	code/game/objects/structures/crates_lockers/crates.dm
	code/game/objects/structures/tables_racks.dm
	code/modules/mining/mine_turfs.dm
	code/modules/paperwork/photocopier.dm
	code/modules/power/cable.dm
	html/changelog.html
 2014-01-29 23:45:21 -05:00
ZomgPonies
3633c2dcb7 Fixed some broken flags 2014-01-29 23:31:22 -05:00
SamCroswell
12ffdb84bd PDA icon fixes, various fixes to select equipt 2014-01-29 17:24:51 -05:00
ZomgPonies
15c0d42abf Merge pull request #138 from alex-gh/brand_int_tweak 
Lowered amout of hostile machines in the brand intelligence event, hight...
 2014-01-29 14:16:26 -08:00
SamCroswell
76840fae78 Additional Select Equiptment Option, More Areas 2014-01-29 17:03:14 -05:00
Zuhayr
b63400ad69 Compile fix. 2014-01-29 16:56:53 -05:00
Zuhayr
b716bf5e1c IPC tweaks. 2014-01-29 16:56:20 -05:00
Zuhayr
5da7b52133 IPC brain surgery code. 
Conflicts:
	code/modules/organs/organ_external.dm
 2014-01-29 16:55:30 -05:00
Zuhayr
e3ce3d4b66 IPC feeding from APCs, IPC lack of reagent processing. 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/power/apc.dm
 2014-01-29 16:51:11 -05:00
alex-gh
45a7b2ceb3 Lowered amout of hostile machines in the brand intelligence event, hightened explosion range 2014-01-29 21:17:31 +01:00
Fox-McCloud
57f113b427 Chemistry and Brain Damage 2014-01-29 00:58:58 -05:00
Rob Nelson
b97a21ed94 Check for internals and accessibility on toxic farts. 
Conflicts:
	code/modules/mob/living/carbon/human/emote.dm
 2014-01-28 23:38:31 -05:00
Ccomp5950
b79edf513c Sniper Rifle fix. 
You have no HUD when zoomed.  None, I'm unable to move every HUD element while zoomed in so you lose it.  Consider it part of your concentration while zoomed in.

If you move while zoomed in you automatically zoom out, you lose concentration.

If the rifle isn't in your active hand you can't zoom in.

Conflicts:
	code/modules/projectiles/guns/energy/special.dm
 2014-01-28 23:30:02 -05:00
ZomgPonies
6dfa08040c Merge pull request #131 from SamCroswell/master 
More C4 suicide phrases. For no Raisin.
 2014-01-28 20:15:26 -08:00
ZomgPonies
bd946b0ab1 Fixes for new species 2014-01-28 16:33:02 -05:00
Zuhayr
e87855633f Actually applied nymph speech and name change. 2014-01-28 15:35:08 -05:00
Zuhayr
b556d59cfe Fixing case on some del() calls. 2014-01-28 15:34:24 -05:00
Zuhayr
80c5d9b5ab Preliminary surgery work for IS_SYNTHETIC. 
Conflicts:
	code/modules/organs/organ_external.dm
 2014-01-28 15:34:04 -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
Zuhayr
f2f9616f2b IPC hairstyles. 
Conflicts:
	code/modules/mob/new_player/sprite_accessories.dm
	icons/mob/human_face.dmi
 2014-01-28 15:14:55 -05:00