cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-05 07:02:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,617 Commits 26 Branches 2 Tags
635fb6f7e2af33b8cbc4e9eef1aac3da4c67e8b2
Commit Graph

3430 Commits

Author SHA1 Message Date
ZomgPonies
c5dac036e1 Fix drag and drop table climbing 2014-07-18 13:04:41 -04:00
Zuhayr
3098c80f9c Fixed some bugs, did some testing, moved some procs around for robot functionality. 
Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
 2014-07-18 07:38:11 -04:00
Zuhayr
bdfc7ef719 Added Crisis and Surgeon modules, removed Medical module, added Construction module, altered Mining and Engineering modules. 
Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
 2014-07-18 07:30:54 -04:00
Walter0o
08c5cdb736 should fix #5618, trivial kitchen utensil bug 2014-07-18 06:58:47 -04:00
Rob Nelson
f7b516a5ab Shit catches on fire now 
Conflicts:
	code/ZAS/Fire.dm
	code/game/objects/items/weapons/storage/bible.dm
	code/game/objects/items/weapons/storage/boxes.dm
	code/modules/mob/living/living_defines.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/photography.dm
	code/setup.dm
 2014-07-18 06:32:15 -04:00
VampyrBytes
34712ecc37 Fix for internal organ surgery 
Fixes internal organ surgery, and some other places where the same
problem would have cropped up
 2014-07-16 20:17:50 +01:00
mwerezak
a07b7a5ce3 Thrown items can be targeted, has miss chance... 
...based on distance, similar to projectiles.

Conflicts:
	code/defines/obj.dm
	code/game/machinery/kitchen/smartfridge.dm
	code/game/machinery/vending.dm
	code/game/mecha/equipment/weapons/weapons.dm
	code/modules/games/cards.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/living_defense.dm
 2014-07-16 09:53:34 -04:00
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
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
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
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
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
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
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
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
mwerezak
cf05d11854 Status displays now won't blank when undocking, too 2014-07-13 06:27:31 -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
baeb58afd5 Fixed moving between tables freely. 2014-06-29 12:04:47 -04:00
Zuhayr
e203cce645 Fixed It won't budge! from crates, added drag and drop for table climbing, added Adajcent check to table climbing. 
Conflicts:
	code/game/objects/structures.dm
 2014-06-29 12:03:39 -04:00
ZomgPonies
920750d8f5 Merge pull request #289 from Regen1/Small-changes 
+1 window crush
 2014-06-28 09:22:51 -04:00
Regen
d708eeec06 +1 window crush 
Added another layer of window crushing
For extra robust
 2014-06-28 15:20:17 +02:00
ZomgPonies
399e4909d6 The death of assistants. Long live civilians! 2014-06-27 17:57:18 -04:00
ZomgPonies
a3e33913d4 Fix lamps/greenlamps. I should have done this ages ago. 2014-06-25 08:05:20 -04:00
ZomgPonies
441f553f9b Runtime fix 2014-06-25 00:13:16 -04:00
Chinsky
71169c7903 Made monkey cube subtypes define what type of monkey they spawn instead of weird switch in Expand(). 
Rewrote belly expanding accordingly. Also now you get a living monkey from the monkey.

Conflicts:
	code/modules/reagents/reagent_containers/food/snacks.dm
 2014-06-24 12:02:29 -04:00
Zuhayr
727d7400ee Shuffling around table and crate knock/climb procs. 
Conflicts:
	code/game/objects/structures.dm
 2014-06-24 06:59:42 -04:00
Zuhayr
a06621b7af Makes table/crate falling a bit more dangerous. 2014-06-24 06:56:07 -04:00
Zuhayr
7ad261bd2f Allows climbing onto tables and crates, also adds falling off if you are dumb enough to stand on one that is flipped or opened. 
Conflicts:
	code/game/objects/structures/tables_racks.dm
 2014-06-24 06:52:13 -04:00
Mloc-Argent
69d9d9fc49 atmos: make fires more destructive 
Fires can now burn through walls, windows, and (with a high enough
 temperature) rwalls.
New proc: adjacent_fire_act().  Called on turfs that a fire isn't able
 to spread to. (walls, floor surrounded by windows, etc.)

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/objects/structures/window.dm
 2014-06-24 06:48:08 -04:00
mwerezak
55532e51a0 Supply controller now holds a ref to it's shuttle 
Instead of having to look it up every time.

Conflicts:
	code/game/supplyshuttle.dm
 2014-06-23 10:33:05 -04:00
ZomgPonies
de5faa1a6a Legless people can drag themselves onto chairs,bed,wheelchairs now. 2014-06-22 15:07:03 -04:00
Zuhayr
38559ab477 Makes forks usable. 
Conflicts:
	code/game/objects/items/weapons/kitchen.dm
	icons/obj/kitchen.dmi
 2014-06-22 10:58:50 -04:00
mwerezak
b64441cb26 Fixes FEA temperature_expose() being used... 
...instead of ZAS fire_act().

Conflicts:
	code/game/gamemodes/blob/theblob.dm
	code/game/machinery/doors/airlock.dm
	code/game/objects/structures/window.dm
	code/game/turfs/simulated/walls_mineral.dm
	code/modules/mob/living/carbon/alien/special/facehugger.dm
	code/modules/reagents/reagent_dispenser.dm
 2014-06-22 02:03:42 -04:00
mwerezak
c67bd0a8e8 Less terrible sprite for suit cooling device 
Also adds a few of them to EVA storage.

Conflicts:
	icons/obj/device.dmi
	maps/tgstation2.dmm
 2014-06-22 01:46:45 -04:00