cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-25 00:41:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,707 Commits 29 Branches 2 Tags
6302573ed34caa8841bbbcdd52845aee9ba00239
Commit Graph

6798 Commits

Author SHA1 Message Date
Zuhayr
6302573ed3 Fixes #4223 
Conflicts:
	code/modules/mob/living/carbon/human/human_damage.dm
	code/modules/mob/living/carbon/human/human_defense.dm
 2014-02-10 07:00:58 -05:00
Zuhayr
56e71df462 Generalized yank_out_object(). 2014-02-10 06:53:25 -05:00
Loganbacca
c58f30564f Fixed shrapnel embedding 
Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
 2014-02-10 06:53:09 -05:00
Rob Nelson
5ce97a7d25 More DNA fixes. 2014-02-07 20:56:21 -05:00
Rob Nelson
c86063c271 Fix genetics spells not working. GG for not using panel variable, nerds. 2014-02-06 23:52:20 -05:00
ZomgPonies
52f7f84999 Diona fix 2014-02-06 23:51:34 -05:00
SamCroswell
bd26d1b0b7 Various Pulse Rifle Fixes 2014-02-06 23:10:02 -05:00
ZomgPonies
96c45dd6a4 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-02-06 03:23:43 -05:00
ZomgPonies
30741408d8 Merge pull request #147 from Fox-McCloud/Blood-Loss-Rebalance 
Blood loss rebalance
 2014-02-06 03:23:28 -05:00
ZomgPonies
05feddb2db Merge pull request #146 from SamCroswell/master 
Ported 'Add Reagents' Verb for VV from /TG/
 2014-02-06 03:23:17 -05:00
SamCroswell
7442282b08 Ninja and DS Mass Driver fixes 2014-02-05 23:02:44 -05:00
Segrain
bde40bd95e Surgery tracking. 2014-02-05 22:54:51 -05:00
ZomgPonies
95a0c8f7e3 compile fix 2014-02-05 22:53:46 -05:00
Ccomp5950
27b4fa0001 Mouse Attack_Logs disabled. Admins rejoice. 
No more mice in disposals spamming the hell out of admins everytime someone flushes items.

Conflicts:
	code/modules/mob/living/living_defense.dm
 2014-02-05 22:53:24 -05:00
Fox-McCloud
73e3773ccb Blood Loss Rebalance 
Makes the middle blood loss stage have slightly different flavortext.

Makes the final stage seem more cumulative of the prior's effects and
removes the silly toxin damage.
 2014-02-04 08:29:02 -05:00
ZomgPonies
74c3c6e83b compile fix 2014-02-04 03:09:04 -05:00
Rob Nelson
75a5337996 Try using backpack for failed item storage first. 
Conflicts:
	code/modules/mob/mob.dm
 2014-02-04 03:08:37 -05:00
ZomgPonies
77417edf6e Revert "New fonts work first iteration" 
This reverts commit 172a4dfc51.
 2014-02-04 02:47:14 -05:00
ZomgPonies
f6fd5b4fd9 Fix blood runtime 2014-02-04 00:54:25 -05:00
ZomgPonies
172a4dfc51 New fonts work first iteration 2014-02-04 00:54:24 -05:00
ZomgPonies
3cedb27fe6 Bugfixes 2014-02-03 18:33:05 -05:00
Loganbacca
1c38b32ee4 Broken heart fix 
Code was using a switch with variables in it. This doesn't work.
Replaced it with an if..else sequence.

Thanks to the guys from Paradise for finding this.

Note: this only fixes literal heart problems, it won't do anything for relationship issues.

Conflicts:
	code/modules/organs/blood.dm
 2014-02-03 01:24:35 -05:00
Fox-McCloud
4cd875c88a Various Tweaks and Fixes 
Adds a replacement for Doctor's Delight (For Syndicakes, valid salad,
etc), fixed chem dispenser NanoUI sizing, and change plasma color from
orange to the canonical purple.
 2014-02-02 06:27:13 -05:00
RKF45
e7e7001aae New preferences 
Conflicts:
	code/modules/mob/new_player/preferences_setup.dm
 2014-02-02 01:58:16 -05:00
Zuhayr
1910e1054d Indentation fix. 2014-02-02 00:45:23 -05:00
Zuhayr
0bfa853e76 Fixed some cocked up checks for alien var. 2014-02-02 00:45:01 -05:00
Zuhayr
656eaddbd3 Added some limited support for alien reagent reactions. 
Conflicts:
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents.dm
 2014-02-02 00:44:44 -05:00
ZomgPonies
564c7bd6ac Fixing up alien reagents 2014-02-02 00:35:51 -05:00
Rob Nelson
f77a0e147b Golem runes use a different method for signing up. 
Conflicts:
	code/modules/mob/living/carbon/metroid/metroid.dm
	html/changelog.html
 2014-02-01 21:28:17 -05:00
ZomgPonies
e7136ba6b6 Fix cable coil healing synth limb burn 2014-02-01 21:24:54 -05:00
Rob Nelson
17cb2faa3d GC stats 2014-02-01 21:08:30 -05:00
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
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