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

11859 Commits

Author SHA1 Message Date
Rob Nelson
dff30f497c Fix borgs and pAIs not being able to use common. 
Conflicts:
	code/modules/mob/living/say.dm
 2014-02-01 21:07:14 -05:00
Rob Nelson
65792246c5 Allow borgs to fake talking on common, and support wires on more mobs. 2014-02-01 21:04:30 -05:00
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
ZomgPonies
05149946d6 Remove borken RPD 2014-02-01 04:30:17 -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
522e153bff Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-01-31 22:28:29 -05:00
Rob Nelson
433d7b52dd Fix gene activation logic. 2014-01-31 22:27:46 -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
ZomgPonies
f752fd2aae Some autolathe sorting stuff 2014-01-31 22:08:30 -05:00
SamCroswell
c7ccf3a0e1 (Untested) Ninja PDA code 
I'll test this later, but I had to push it out ASAP, gonna reformat very
soon.
 2014-01-31 17:24:11 -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
7a99402138 Compile fix 2014-01-31 03:19:42 -05:00
ZomgPonies
1b1cf1900d Merge pull request #140 from Fox-McCloud/Revert-Brain-Damage 
Revert brain damage
 2014-01-30 23:57:09 -08:00
Razharas
c72e625e53 Returned to the forces of light thanks to gia 
No more text paths, only normal paths
 2014-01-31 02:56:40 -05:00
Razharas
5c8d9ede3b Added chem handling and IED recipe 
Uh oh

Conflicts:
	code/game/atoms.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/objects/structures/tables_racks.dm
 2014-01-31 02:56:27 -05:00
Razharas
17151cd7b2 Some recipes and addable parts 
Indeed
 2014-01-31 02:51:57 -05:00
Razharas
58cb6a147a Return to the text paths 
Yes byond doesnt let me use normal paths as association for numbers
 2014-01-31 02:51:36 -05: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
Rob Nelson
b8a6504be3 Perform additional checks on qdel(), add some docs. 2014-01-31 02:29:31 -05:00
ZomgPonies
d5c5fc5669 Reverted Astar fail-update 2014-01-31 02:29:01 -05:00
SamCroswell
0e20cec0d4 Various Map / Ninja Fixes 2014-01-30 23:39:14 -05:00
SamCroswell
81cb2246f3 Ninja hoods can no longer slip off their head. Derp. 2014-01-30 22:56:29 -05:00
Rob Nelson
33398a1297 Get rid of debugging. 2014-01-29 23:47:13 -05:00
d3athrow
65c0e3faac Should fix the issue of the GC turning gliding movement off 2014-01-29 23:46:54 -05:00
Rob Nelson
0a2d0f4e33 I give up. 2014-01-29 23:46:39 -05:00
Rob Nelson
fa6655c190 Hopefully fix more step smoothing? 2014-01-29 23:46:24 -05:00
Rob Nelson
df9f735565 Clean up the switch statement. 2014-01-29 23:46:02 -05:00