cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-30 20:22:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,015 Commits 26 Branches 2 Tags
ea1feb41ddafb55b4459370e38c6eead71ec4f4e
Commit Graph

423 Commits

Author SHA1 Message Date
Graham Lloyd
2c4e98a726 Fireaxe cabinet hacking now fails if player moves away 2014-08-04 22:15:12 -04:00
Whitellama
8c27a4e092 Wet rag no longer makes noise or hits when wiping down windows (nor does anything with the NOBLUDGEON flag) 2014-08-03 15:28:36 -04:00
ZomgPonies
89508f7e7f Merge pull request #334 from Bone-White/master 
Advanced Medical Hud Glasses (medihud + flash protection)
 2014-07-27 11:58:42 -04:00
Bone White
abde4759ae Advanced Medical Hud Glasses (medihud + flash protection) 
For blueshield and brig physician.  Also added the item to blueshield
locker.  Item allows medical record viewing/editing.  I have _NOT_ added
security record viewing/editing.
 2014-07-27 16:06:35 +01:00
Rob Nelson
2873262a07 Recoded wall-smoothing for optimization. Fixes #835. 
Conflicts:
	code/game/smoothwall.dm
	code/game/turfs/simulated/walls.dm
	code/modules/power/singularity/singularity.dm
 2014-07-25 16:29:00 -04:00
Rob Nelson
09743b6235 More burnable shit 
Conflicts:
	code/game/turfs/simulated/floor_types.dm
 2014-07-24 21:07:32 -04:00
ZomgPonies
f2ecd1503b Completed adding Kidan Ambassador decorations 2014-07-23 13:24:51 -04:00
Necaladun
467c289cc2 Removed gun and armour from HoP closet 
Removed egun, helmet and armour from HoP because they are NOT sec.
 2014-07-22 18:48:49 +09:30
ZomgPonies
01ce1db6ff Fix drag and drop climbing, finally 2014-07-18 17:35:35 -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
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
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
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
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
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
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
Regen
d708eeec06 +1 window crush 
Added another layer of window crushing
For extra robust
 2014-06-28 15:20:17 +02:00
ZomgPonies
441f553f9b Runtime fix 2014-06-25 00:13:16 -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
ZomgPonies
de5faa1a6a Legless people can drag themselves onto chairs,bed,wheelchairs now. 2014-06-22 15:07:03 -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
Chinsky
3ae1d2011f Fixes #5311 2014-06-21 12:57:03 -04:00
mwerezak
4a2993b20b Separates the sharp flag into edge and sharp 
Now weapons can properly cause cuts without necessarily having a greater
chance to remove limbs.

Also separates is_sharp, has_edge, and can_puncture.

Conflicts:
	code/__HELPERS/unsorted.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/silicon/robot/component.dm
	code/modules/mob/living/simple_animal/bees.dm
	code/modules/projectiles/gun.dm
	code/modules/reagents/reagent_containers/syringes.dm
	code/modules/surgery/eye.dm
 2014-06-17 06:51:51 -04:00
ZomgPonies
bd346bca9a Bleh 2014-06-17 04:04:57 -04:00
ZomgPonies
c0f997a022 Fix science shuttle and white windows galore. 2014-06-17 03:44:15 -04:00
ZomgPonies
128e1ba386 Revert "Fix safe...?" 
This reverts commit 0762e137ab.
 2014-06-16 22:03:03 -04:00
ZomgPonies
386b1b8307 Fixes a bunch more hurt -> harm checks 2014-06-14 01:02:29 -04:00
Rob Nelson
0762e137ab Fix safe...? 
Conflicts:
	code/game/objects/objs.dm
 2014-06-05 16:21:26 -04:00
Hubblenaut
70d96aedde Makes crashing into things possible with extinguisher or harm intent 2014-06-03 18:46:52 -04:00
Hubblenaut
2e644b845a Adds Wheelchairs with basic driving functionality 
Conflicts:
	baystation12.dme
	icons/obj/objects.dmi
 2014-06-03 18:46:21 -04:00
alex-gh
5555974634 Stunbeams should be effective against janicarts again 2014-06-02 09:53:30 +02:00
ZomgPonies
06bbfcf150 Final Nations patch before live testing. This is going to be painful. 2014-05-27 20:09:10 -04:00
Zuhayr
fbbb3b50ce Fixes #4923 2014-05-12 03:10:37 -04:00
Razharas
4b2deebec6 Making datum handling not suck balls too hard 
Yeah now it can roughly be called okish
 2014-05-04 22:56:38 -04:00
Razharas
8ee92a0f81 Removing debug shite 2014-05-04 22:56:01 -04:00
Razharas
95b6406adb Makes this shit actually work 
Yeah, also added crafting controller to debug controllers(who will need
to debug crafting, but whatever)

Conflicts:
	code/controllers/verbs.dm
 2014-05-04 22:55:42 -04:00
Razharas
3d762cd892 Readded the crafting to tables 
Well at least now i can brag about how you can do this with just few
lines

Conflicts:
	code/game/objects/structures/tables_racks.dm
 2014-05-04 22:54:08 -04:00
Razharas
281fbc7648 Made crafting entirely datum 
Now it can be useful
Maybe
Probably
I hope

Conflicts:
	code/_globalvars/lists/objects.dm
	code/game/atoms.dm
	code/game/objects/structures/tables_racks.dm
 2014-05-04 22:47:38 -04:00
ZomgPonies
679f0fe293 Merge pull request #194 from SamCroswell/master 
Nukeops Weapons Rework
 2014-05-04 15:43:03 -04:00
SamCroswell
740991092a Nukeops Weapons Rework 
Nukeops now start with a Stechtkin Pistol instead of the C-20r.
In addition, they now have more items available to purchase in their
uplink (Exclusive to Nukeops). They are as follows:
C-20r - 6TC
L6SAW - 10TC
C-20r Mag - 1TC
L6SAW Mag - 3TC
Stechtkin Silencer - 1TC
Advanced Medkit - 3TC

The prices are, of course, subject to change as we observe further
Nukeops rounds.
 2014-05-04 10:24:48 -04:00
ESwordTheCat
532298c725 Tweak object pool system. 
Conflicts:
	code/game/objects/structures/grille.dm
	code/modules/projectiles/projectile/beams.dm
	code/modules/projectiles/projectile/bullets.dm
	code/modules/projectiles/projectile/special.dm
 2014-05-03 22:54:09 -04:00
SamCroswell
f4ef7c192b Map changes, new Ninja masks 
Map changes including: RnD layout change, new customs lounge, xenoarch
windows fix, and more. Also added a few new Ninja masks in prep for some
bigger changes I have planned.
 2014-05-03 18:35:10 -04:00
ESwordTheCat
ebfcc9be79 Object pool for beam projectile, minor changes to object pool. 
Conflicts:
	code/WorkInProgress/Cael_Aislinn/Rust/gyrotron.dm
	code/WorkInProgress/Cael_Aislinn/Supermatter/ZeroPointLaser.dm
	code/game/objects/structures/grille.dm
	code/modules/power/singularity/emitter.dm
	code/modules/projectiles/projectile.dm
	code/modules/projectiles/projectile/beams.dm
 2014-04-29 13:33:06 -04:00