cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-09 17:13:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,524 Commits 26 Branches 2 Tags
dd6f54ed4747d026300f59cd38c4ff145941cefb
Commit Graph

7289 Commits

Author SHA1 Message Date
Neerti
dd6f54ed47 fun fact: This took 6 hours because bay uses different say(). 
fun fact: I'm never porting say-related stuff from bay.

Conflicts:
	code/game/objects/items/devices/radio/encryptionkey.dm
	code/game/objects/items/devices/radio/headset.dm
	code/modules/mob/living/say.dm
	code/modules/mob/living/silicon/ai/ai.dm
 2014-07-16 09:27:12 -04:00
ZomgPonies
aafa11712a Removal of virus1/disease1 system. So long GBS/Jungle Fever, you'll be missed! 2014-07-16 00:53:08 -04:00
VampyrBytes
d8bb31c2f8 Fixes #236 
Fixes genetic side effect monkeys being turned human, and some of the
dna2 procs that weren't working properly because of some bad defines
 2014-07-14 19:24:09 +01:00
mwerezak
3aaff9126d Doors now retry if they fail to complete commands 2014-07-15 11:21:13 -04:00
mwerezak
25c2fb2519 Moves misplaced var from airlock_control.dm 
Moved explosion_resistance from airlock_control.dm to airlock.dm proper.
 2014-07-15 11:21:00 -04:00
ZomgPonies
4bfb46037f Moar Object verb removal/switch to right-click 2014-07-15 09:18:37 -04:00
ZomgPonies
88098da3c7 Object verb removal crew 2014-07-15 08:47:43 -04:00
Mark Aherne
92ac2f4568 Correct pregame_timeleft from my debug value 20 to production value 180. 2014-07-15 07:25:42 -04:00
Mark Aherne
9b45dbabfb Continued work in progress on a major revision of the NanoUI templating system. 
Conflicts:
	code/ATMOSPHERICS/components/omni_devices/filter.dm
	code/ATMOSPHERICS/components/omni_devices/mixer.dm
	code/game/dna/dna_modifier.dm
	code/game/machinery/cryo.dm
	code/game/machinery/kitchen/smartfridge.dm
	code/modules/nano/nanoexternal.dm
	code/modules/nano/nanomanager.dm
	code/modules/nano/nanoui.dm
	code/modules/power/apc.dm
	code/modules/power/smes.dm
	code/modules/reagents/Chemistry-Machinery.dm
	nano/css/shared.css
	nano/js/nano_update.js
	nano/templates/escape_pod_console.tmpl
 2014-07-15 07:22:15 -04:00
ZomgPonies
1eb02b5cf4 Overhauled holsters and webbings 2014-07-15 04:02:24 -04:00
Kelenius
c54b9e3626 Slime update 
Conflicts:
	baystation12.dme
	code/modules/mob/living/carbon/metroid/death.dm
	code/modules/mob/living/carbon/metroid/metroid.dm
	code/modules/mob/living/say.dm
	code/modules/mob/transform_procs.dm
	code/modules/reagents/Chemistry-Recipes.dm
	maps/tgstation2.dmm
 2014-07-15 00:50:41 -04:00
ZomgPonies
ce04d9551c Added NT Recruiter and Sec Pod Pilot karma jobs 2014-07-13 22:34:06 -04:00
d3athrow
6be6347a1f Glowing computers to start 
Conflicts:
	code/game/machinery/computer/power.dm
 2014-07-13 16:03:12 -04:00
Menshin
bd6b5a6870 Refined the implementation of the AStar algorithm : 
*Reorganised and commented used procs for better visibility/maintenance
*Redid the PriorityQueue class
*Changed the euclidian distance to the byond one (so that we don't calculate float and square root when it's not necessary)
*Made the AStar algorithm use the closed list instead of just filling it
*Some optimization in the open list sorting : last entered is first in case of f ties, slightly less tiles are checked now
*Changes the order directions are checked when adding adjacents turfs to make for more 'realistic' path (read less 'drunk pathing' with lots of diagonals)
*Fixed some turfs densities not being check for diagonal movement
*Closed firedoors are now correctly seens as blocked by the algorithm
*Cleanbots now only moves in cardinal directions, like other bots.
*Updated the info text at the beginning of the file a bit
*Absolutely unrelated : simplified the turf.Bless() proc

Conflicts:
	code/__HELPERS/unsorted.dm
	code/defines/procs/AStar.dm
	code/game/machinery/bots/bots.dm
	code/game/machinery/bots/cleanbot.dm
	code/game/machinery/doors/firedoor.dm
	code/game/machinery/doors/windowdoor.dm
	code/game/turfs/turf.dm
 2014-07-13 15:50:15 -04:00
Kelenius
8b6bd9dca5 usr -> user 
Conflicts:
	code/_onclick/hud/screen_objects.dm
	code/game/objects/items/devices/PDA/PDA.dm
 2014-07-13 15:25:11 -04:00
Kelenius
b6c6138c44 Gives the AI a hud 
Conflicts:
	code/_onclick/hud/_defines.dm
	code/_onclick/hud/other_mobs.dm
	code/_onclick/hud/screen_objects.dm
	code/game/objects/items/devices/PDA/PDA.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/mob/living/silicon/ai/say.dm
	code/modules/paperwork/photography.dm
 2014-07-13 15:20:08 -04:00
igalan
0c4e47f4fd Removed commented out useless crap. 
Conflicts:
	code/defines/obj/weapon.dm
 2014-07-13 09:09:14 -04:00
igalan
7940e3d6db Syntiflesh is defined twice, both as a food/snack and obj/item/weapon. The first one is edible while the second one is not. 
This PR comments out the non-edible one and replaces any reference of it to the edible one.

Conflicts:
	code/defines/obj/weapon.dm
	maps/tgstation2.dmm
 2014-07-13 09:07:36 -04:00
Walter0o
955dfca291 removes sharpness from forks 
too commonly available to enjoy the sharp bonus.
 2014-07-13 08:59:41 -04:00
mwerezak
44e2f8acf2 Fixes human internal organs list 
Conflicts:
	code/modules/events/organ_failure.dm
	code/modules/organs/blood.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/surgery/ribcage.dm
 2014-07-13 08:51:55 -04:00
DJSnapshot
a76be6bf7c Nerf on sound distance. 2014-07-13 08:47:31 -04:00
Hubblenaut
447b5e3faf Fixes me being dumb with renaming variables 2014-07-13 08:34:38 -04:00
Hubblenaut
776369d9ee Health Analyzer can read all types of beneficial medicine 
Conflicts:
	code/game/objects/items/devices/scanners.dm
	code/modules/reagents/Chemistry-Reagents.dm
 2014-07-13 08:32:14 -04:00
mwerezak
87e7c32959 Fixes advanced trauma kits claiming to disinfect but not doing so 
Conflicts:
	code/game/objects/items/stacks/medical.dm
 2014-07-13 08:18:16 -04:00
mwerezak
f42244730b Removes duplicate defines, updates comments 
Conflicts:
	code/game/machinery/embedded_controller/docking_program.dm
 2014-07-13 07:30:39 -04:00
ZomgPonies
8f0e56f4fa 3d sound fixes 2014-07-13 07:19:24 -04:00
DJSnapshot
656eddf60d volume fallout over distance to make it even better. 
Conflicts:
	code/game/sound.dm
 2014-07-13 07:16:00 -04:00
DJSnapshot
a305c88276 3D EAX Environmental sound 2014-07-13 07:15:01 -04:00
John-Michael O'Brien
1e6963f1c8 Update PDA.dm 
Patched the comment to match the actual, final behavior (Doh!)
 2014-07-13 07:14:01 -04:00
JimTheCactus
6c7ab75146 Patched PDA scanner to be more useful 
PDA's integrated scanner was VERY rudimentary. Patched it to resolve
some formatting issues and improve usability.
 2014-07-13 07:13:45 -04:00
mwerezak
8459ed1b52 Fixes #5459 
Conflicts:
	code/game/machinery/embedded_controller/docking_program.dm
 2014-07-13 07:12:01 -04:00
Walter0o
172821f86d fixes computers eating cards 
this commit :
ea1060ac33

added in machinery's attack_hand() proc, line 238
```
if(!allowed(user))
		user << "\red Access Denied."
		return 1
```

to almost all machinery including computers, since they call this proc via their attack_hand() procs.

allowed(user), see access.dm line 94, in turn only checks the user's hand and wear_id,
NOT the card inside the machine,
as different machines have different vars and systems handling how they can be accessed.

instead of fixing the underlying problem, eject card verbs were added like this one :
30385c2237

this PR reverts that nonsense machinery addition and adds the shuttle_control access check where it belongs.
Conflicts:
	code/game/machinery/machinery.dm
 2014-07-13 07:09:01 -04:00
Hubblenaut
6c0122e7d6 Fixes in wheelchair and different handling of movement 
Conflicts:
	code/game/objects/structures/stool_bed_chair_nest/bed.dm
	code/modules/mob/mob.dm
 2014-07-13 06:52:38 -04:00
Hubblenaut
b9be3e6ed7 Stops buckled mobs from slipping (for now) 
Conflicts:
	code/game/turfs/simulated.dm
 2014-07-13 06:48:17 -04:00
ZomgPonies
9b1247a21c Fixes blood on wheelchair 2014-07-13 06:47:05 -04:00
Zuhayr
b3fc3a4a15 Fucking Hell I'm an idiot. 2014-07-13 06:34:22 -04:00
unknown
7afc2a50d4 Makes the cargo console force launch command more obvious 2014-07-13 06:34:06 -04:00
mwerezak
cf05d11854 Status displays now won't blank when undocking, too 2014-07-13 06:27:31 -04:00
mwerezak
e8b9375887 Allows escape pods to be armed from inside the pod 
Conflicts:
	code/game/machinery/embedded_controller/simple_docking_controller.dm
 2014-07-13 06:27:01 -04:00
Zuhayr
0266582acb Missed a linebreak. 2014-07-13 06:22:39 -04:00
Zuhayr
197fc0c36c Cleans up some of the lore issues with Mutiny. 
Conflicts:
	code/game/gamemodes/mutiny/directives/financial_crisis_directive.dm
 2014-07-13 06:22:30 -04:00
Zuhayr
1b1961b4fd Changed Mutiny messages to use the existing Centcomm message format. 
Conflicts:
	code/game/gamemodes/mutiny/mutiny.dm
 2014-07-13 06:21:10 -04:00
mwerezak
3f7a6286b8 Improves the display of shuttle ETAs 
Conflicts:
	code/controllers/emergency_shuttle_controller.dm
 2014-07-13 06:09:33 -04:00
mwerezak
7e64846a95 Improves suit cooler 
Adds a few vars items should have, e.g. throwforce, flags, etc. Also
origin_tech.
 2014-07-13 05:54:02 -04:00
Zuhayr
b148235669 Wtf how did this line even get deleted. 2014-07-13 05:47:38 -04:00
Zuhayr
fe1cf5ef77 Oversight with table fix. 2014-07-13 05:47:21 -04:00
Zuhayr
92192021af Compile fix. 2014-07-13 05:45:43 -04:00
Zuhayr
02a7109037 Fixes #5434 2014-07-13 05:45:23 -04:00
Zuhayr
03ca219356 Fixes #5443 2014-07-13 05:43:53 -04:00
ZomgPonies
92940e1c00 Running tests and cleaning out useless debug verbs/procs. 2014-07-13 05:32:40 -04:00