cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-27 18:01:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,631 Commits 28 Branches 2 Tags
f752fd2aae98737fe2d57e78cf23c2d39f524e22
Commit Graph

6745 Commits

Author SHA1 Message Date
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
SamCroswell
673948a003 Preparing Ninjas to be implemented 
Tweaks and fixes, as well as the removal of some of my unfinished works,
to Ninja so in preparation for their implementation. Also a few Telesci
fixes.
 2014-01-28 12:38:00 -05:00
ZomgPonies
ede85dbcc5 Fix preferences menu 2014-01-28 02:01:41 -05:00
ZomgPonies
40ef1367ad Fix for player preferences 2014-01-28 00:09:25 -05:00
ZomgPonies
ecf424bd46 Fix to player voice toggle 2014-01-27 22:22:31 -05:00
ZomgPonies
7014f6f83e More fixes to text2speech 2014-01-27 16:58:52 -05:00
ZomgPonies
bd3e0c1cf8 Let's try it like this 2014-01-27 16:07:48 -05:00
ZomgPonies
808143f976 Final text2voice commit 2014-01-27 13:03:25 -05:00
ZomgPonies
7776ee0d00 Also switch view to range, because you don't need to SEE who you stink up 2014-01-26 20:49:02 -05:00
ZomgPonies
55a58d8df1 Fixes farting through airlocks 2014-01-26 20:47:56 -05:00
ZomgPonies
5205df0f7d Genetic abilities fixes 2014-01-26 19:10:12 -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
22f6bb90be Add additional extinguisher logging, transfer logging framework. 
Conflicts:
	code/game/objects/items/weapons/extinguisher.dm
 2014-01-25 12:29:21 -05:00
Rob Nelson
9364a81746 Fix new genetics stealth powers. 
Conflicts:
	code/modules/mob/mob_defines.dm
 2014-01-25 12:26:34 -05:00
ZomgPonies
a9245dceee Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-01-24 22:05:43 -05:00
Rob Nelson
14b807c26c Fix speaking on departmental channels 2014-01-24 21:44:10 -05:00
ZomgPonies
1ff258fd4e Merge pull request #128 from Regen1/master 
Updated sprite to actually fit our server
 2014-01-24 15:20:38 -08:00
ZomgPonies
d1dc02063c Holodeck update / Holocarp 2014-01-24 17:24:38 -05:00
Regen
df2770eeb1 Updated sprite to actually fit our server 
Because the used sprite failed completely.
I also made it better looking (my opinion) and actually centered on
character following other sprites, so it doesn't overlap or is too
short.
Also updated name, because why did I use capital letters in the first
place.
 2014-01-24 22:18:07 +01:00
Rob Nelson
1f30243a08 Refactor the fuck out of theft objectives. No more stealing your own jumpsuit. 
Conflicts:
	code/datums/mind.dm
	code/game/gamemodes/objective.dm
	code/modules/mining/money_bag.dm
	code/modules/mining/ores_coins.dm
	html/changelog.html
 2014-01-24 12:16:57 -05:00
d3athrow
e937bdd4c2 Should in fact, really fix the monkey dna 2014-01-24 12:05:54 -05:00