cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-30 04:02:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,483 Commits 26 Branches 2 Tags
f44ff1d7aa2b34638ca0f8a7cd0df4bd0ee8f33e
Commit Graph

3114 Commits

Author SHA1 Message Date
Rob Nelson
f44ff1d7aa Standardize FAT 
Conflicts:
	code/modules/client/preferences.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/simple_animal/constructs.dm
	code/modules/mob/mob.dm
	code/modules/mob/mob_grab.dm
 2014-01-21 22:57:10 -05:00
Rob Nelson
d49e6d3bf4 Standardize CLUMSY 
Conflicts:
	code/game/jobs/job/civilian.dm
	code/game/objects/items/weapons/defib.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/modules/mob/living/silicon/robot/component.dm
	code/modules/reagents/reagent_containers/syringes.dm
 2014-01-21 22:49:22 -05:00
Rob Nelson
22a2df1115 Standardize HULK. 
Conflicts:
	code/game/mecha/mecha.dm
	code/game/objects/items/weapons/swords_axes_etc.dm
 2014-01-21 22:45:40 -05:00
Rob Nelson
dd8c8c12ab Standardize XRAY. 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	maps/RandomZLevels/wildwest.dm
 2014-01-21 22:37:37 -05:00
ZomgPonies
cb5367ed96 Switching cable coils to stacks 2014-01-21 21:23:26 -05:00
Razharas
8f71ea55e3 Added tools and time handling 
Well yeah
 2014-01-21 21:05:50 -05:00
Razharas
56e56b31a6 Implemented crude crafting 
Debug messages are still inside, pushing only cozx pete asked me to

Conflicts:
	code/_globalvars/lists/objects.dm
	code/game/objects/structures/tables_racks.dm
 2014-01-21 21:05:42 -05:00
Rob Nelson
57dc0ddd50 Implement toxic farts. 
Conflicts:
	code/game/objects/effects/effect_system.dm
	code/modules/mob/living/carbon/human/human_defines.dm
 2014-01-21 14:35:15 -05:00
ZomgPonies
bb853093c1 Intercom runtime fix 2014-01-20 04:05:29 -05:00
Rob Nelson
a04324baef Fix more by-ref issues in DNA 
Conflicts:
	code/game/machinery/hydroponics.dm
 2014-01-20 01:54:33 -05:00
Rob Nelson
c349f761d9 Fixes for DNA2, again, 2014-01-20 01:50:56 -05:00
Rob Nelson
20bc568131 Fix DNA injectors breaking shit. 
Conflicts:
	code/game/dna/dna2_helpers.dm
 2014-01-20 01:49:49 -05:00
Rob Nelson
6fe47cfc51 Standardize buffers on all DNA machines in an attempt to fix DNA modifiers. WILL BREAK SHIT 
Conflicts:
	code/game/machinery/computer/cloning.dm
	code/game/objects/items/weapons/dna_injector.dm
 2014-01-20 01:48:57 -05:00
Rob Nelson
fd6cc3e458 HA HA NEW GENE HANDLING 
Also fixed block injector crash.

Conflicts:
	code/game/dna.dm
	code/modules/mob/living/carbon/monkey/monkey.dm
	html/changelog.html
 2014-01-20 01:41:03 -05:00
Rob Nelson
dc60cc1726 DNA modifiers work now. 
Conflicts:
	code/defines/obj/hydro.dm
	code/game/machinery/cloning.dm
	code/game/machinery/hydroponics.dm
	code/modules/mob/living/carbon/zombie/zombie.dm
	code/modules/mob/transform_procs.dm
 2014-01-20 00:54:46 -05:00
Rob Nelson
4a8ca0a7d4 Now tested up to character join. 2014-01-20 00:44:10 -05:00
Rob Nelson
db21525feb SAY HELO TO DNA2, N3X15'S AWFUL FUCKING RECODE OF DNA 
Conflicts:
	baystation12.dme
	code/game/gamemodes/setupgame.dm
	code/game/objects/items/weapons/dna_injector.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_defines.dm
	code/modules/mob/new_player/new_player.dm
 2014-01-20 00:43:19 -05:00
d3athrow
266c80a764 sanity checking to resolve runtimes 2014-01-19 23:59:26 -05:00
Pete Goodfellow
331cf1df95 Updated all suicide_act()s to use a new span class, 'suicide'. 
Conflicts:
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/weapons/melee/energy.dm
	code/game/objects/items/weapons/melee/misc.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/objects/items/weapons/weaponry.dm
	code/modules/hydroponics/growninedible.dm
	code/modules/hydroponics/hydroitemdefines.dm
	code/modules/surgery/tools.dm
	code/stylesheet.dm
 2014-01-19 21:25:47 -05:00
ZomgPonies
11f32fba24 Nerfed amount of spiders 2014-01-19 21:01:07 -05:00
ZomgPonies
65d023dd93 Facehugger to Full alien, all player controlled 2014-01-19 16:45:20 -05:00
ZomgPonies
90496be20a Standardized intent names so it's all harm. Fuck you hurt. 2014-01-19 08:30:50 -05:00
Glloyd
085de1b71c Resolves #2213 Fixes the back icons for the scythe and the Roman shield. 
Conflicts:
	icons/mob/back.dmi
 2014-01-19 05:32:34 -05:00
SamCroswell
d498adb324 Ninja / CentComm changes 2014-01-18 00:34:24 -05:00
Aranclanos
eb76256f04 Adds the captain's medal to the medal's lockbox. 
Fixes issue 2358

Conflicts:
	code/game/objects/items/weapons/storage/lockbox.dm
 2014-01-16 21:55:00 -05:00
ZomgPonies
b80552169c Stupid type 2014-01-15 13:13:13 -05:00
Mark Aherne (Faerdan)
c1c49fe6d8 Canister, Tank & Tank Transfer Value NanoUIs. 
* Added Canister, Tank & Tank Transfer Value NanoUIs.

Conflicts:
	code/game/machinery/atmoalter/canister.dm
	nano/css/shared.css
 2014-01-15 01:53:51 -05:00
ZomgPonies
acb3f37c1b vg's likely superior bot code. 2014-01-13 04:24:16 -05:00
Rob Nelson
55e918cc6a Wire hacking recode from /tg/. 
Conflicts:
	baystation12.dme
	code/__HELPERS/mobs.dm
	code/defines/obj/weapon.dm
	code/game/machinery/alarm.dm
	code/game/machinery/doors/airlock.dm
	code/game/machinery/machinery.dm
	code/game/machinery/vending.dm
	code/game/objects/items/devices/paicard.dm
	code/game/objects/items/weapons/explosives.dm
	code/global.dm
	code/modules/assembly/signaler.dm
	code/modules/mob/living/silicon/mommi/life.dm
	code/modules/mob/living/silicon/mommi/mommi.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/robot/wires.dm
 2014-01-12 22:37:55 -05:00
Rob Nelson
d3c4f0a5e7 New posters from BS12, plus custom poster-loading system that allows dynamic loading. 
Conflicts:
	baystation12.dme
	code/game/objects/effects/decals/contraband.dm
	html/changelog.html
	icons/obj/contraband.dmi
 2014-01-12 03:45:32 -05:00
Ccomp5950
f217cae518 NanoUI PDA optimizations no more sortAtom every tick on every PDA. 
Should be noticably better on large population servers.

Conflicts:
	code/game/objects/items/devices/PDA/PDA.dm
 2014-01-11 21:50:53 -05:00
ZomgPonies
24dceac4ef Compile fix 2014-01-11 21:07:13 -05:00
Rob Nelson
92722efe15 Fixed #395: Cut down posters can't be replaced. 
Conflicts:
	code/game/objects/effects/decals/contraband.dm
 2014-01-11 20:46:29 -05:00
Rob Nelson
8a6ea1d5c9 Fix multiple bugs with catwalks. 
* Fixes catwalks not having space underneath them
* Fixes not being able to build catwalks
* Catwalks destructible with screwdriver
* Catwalks autoupdate icons with neighbors

Conflicts:
	code/game/turfs/simulated/floor.dm
	code/game/turfs/simulated/floor_types.dm
	html/changelog.html
 2014-01-11 20:43:31 -05:00
JJRcop
3d34a12066 Minor nuke toy edit 
Moved the user.visible_message call out of spawn()
Removed the now obsolete sleep() call and put the delay in spawn()
 2014-01-11 12:45:45 -05:00
JJRcop
24e29deeaf Adds "surround" arg to playsound, which enables 3D sound 
Defaulted to on
Also changes the toy nuke to use it

Conflicts:
	code/game/sound.dm
 2014-01-11 12:45:32 -05:00
JJRcop
7b678241e4 Adds a visible_message to the nuke toy when it is used 2014-01-11 12:40:53 -05:00
JJRcop
e235bc94e6 Adds new nuke toy, plays nuke sound when attack_self'd 
Cooldown of 5 minutes

Conflicts:
	code/game/machinery/computer/arcade.dm
	code/game/objects/items/toys.dm
	icons/obj/toy.dmi
 2014-01-11 12:40:19 -05:00
ZomgPonies
ab8422f5aa More hull resistance tuning 2014-01-11 06:01:30 -05:00
Rob Nelson
5a061d770f Fix #381 - Poster duping 2014-01-10 02:04:20 -05:00
Rob Nelson
2b1e308e31 Fix #384 - Fridges can be opened while welded shut. Also discovered this extended to secure lockers. 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
	html/changelog.html
 2014-01-10 02:03:51 -05:00
Rob Nelson
ea5784a4aa Fix for #382 - Bombs not deleting themselves and the fridge they're in. 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
 2014-01-10 02:02:34 -05:00
Rob Nelson
dbe20f8216 Fix for #383 - C4 deleting fridges full of corpses. 2014-01-10 02:01:19 -05:00
Rob Nelson
5b6648a2c9 Fix #384 (possibly): Welding a fridge/freezer does nothing. 2014-01-10 02:00:51 -05:00
Rob Nelson
9fdde1eec7 Fix #388: Incorrect C4 timing checks. 
Conflicts:
	code/game/objects/items/weapons/explosives.dm
 2014-01-10 01:59:07 -05:00
Rob Nelson
da6b615e44 Adjacent didn't work, back to using get_dist. 2014-01-10 01:56:45 -05:00
SkyMarshal
e2bbbb7e39 Mining fixes as it was annoying as fuck. Also a random object with nothing in it removed. 
Conflicts:
	code/modules/mining/mine_turfs.dm
 2014-01-09 20:56:38 -05:00
SkyMarshal
d101e5c111 RCDs no longer create plating with air on it. 
Fixes #3545
 2014-01-09 20:26:28 -05:00
Rob Nelson
9bdae9ff75 Fix fire extinguishers bluespacing their contents afar when dumping. 
Also use Adjacent so we can't dump through windows.

Conflicts:
	code/game/objects/items/weapons/extinguisher.dm
 2014-01-09 05:09:51 -05:00
Cheridan
2b87fcf581 Upgradeable Laser Pointers! 
Laser pointers can be upgraded with laser stock parts, which increases the odds of hitting a target.
Whee!

Conflicts:
	code/game/objects/items/devices/laserpointer.dm
 2014-01-09 04:20:08 -05:00