cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-25 17:51:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,605 Commits 26 Branches 2 Tags
fa6655c1908134f792b5890b28dd67d24a9cfad6
Commit Graph

3142 Commits

Author SHA1 Message Date
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
6dfa08040c Merge pull request #131 from SamCroswell/master 
More C4 suicide phrases. For no Raisin.
 2014-01-28 20:15:26 -08: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
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
SamCroswell
beea722e60 More C4 suicide phrases. For no Raisin. 2014-01-26 14:45:16 -05:00
ZomgPonies
f084d49d24 Compile fixes 2014-01-25 12:40:47 -05:00
ZomgPonies
2e5fc8a4fc Revert "Display cases now constructable." 
This reverts commit 3e210aa75c.
 2014-01-25 12:29:29 -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
d3athrow
58275e6ddc Fuck you emisune 2014-01-25 12:27:07 -05:00
d3athrow
253035f935 Fixes #452, people who are silenced for whatever reason or miming can't use the megaphone 2014-01-25 12:26:54 -05:00
Rob Nelson
3e210aa75c Display cases now constructable. 
* Make machine frame
* Add glass (do not wire)
* Add airlock controller board (set perms first)
* Screwdriver

Disassemble by crowbarring when unlocked or broken.

Conflicts:
	get_dmi_header.bat
	html/changelog.html
	icons/obj/stock_parts.dmi
 2014-01-24 21:42:33 -05:00
Rob Nelson
dd7f48c470 More typo. 2014-01-24 12:24:35 -05:00
Rob Nelson
e3a2a9238d Fix typo before someone notices. 2014-01-24 12:24:14 -05:00
ZomgPonies
47e8c640a2 New display case code 2014-01-24 12:23:26 -05:00
Rob Nelson
341d210c99 Fix some issues with the radio, like talking on common when calling for command. 2014-01-24 12:04:52 -05:00
Rob Nelson
d01ef41eac Radio code in say.dm cleaned up, will use all possible radios when sending a message. 
Conflicts:
	code/modules/mob/living/say.dm
 2014-01-23 23:48:46 -05:00
ZomgPonies
f1c80be06f Merge pull request #127 from SamCroswell/master 
Tweaks 'n shit
 2014-01-23 20:34:50 -08:00
Ergovisavi
7ad68dd693 Replaced wall_smash in simple_animal with environment_smash, because before, you either tables AND walls, or nothing. If set to 1, smash crate/locker/rack/table, 2 for wallsmash, 3 for rwall smash 
Hostile mobs with environment smash will also unbuckle themselves by destroying whatever they're buckled to when angered.

Conflicts:
	code/game/objects/structures/stool_bed_chair_nest/bed.dm
	code/game/objects/structures/tables_racks.dm
	code/game/turfs/simulated/walls.dm
	code/modules/mob/living/simple_animal/hostile/hostile.dm
 2014-01-23 23:31:36 -05:00
SamCroswell
d4890fb2f5 Additional Drug Names 2014-01-23 19:26:32 -05:00
SamCroswell
f59fa5474e Contraband Crate Changes, Minor Drug Tweaks 
More little tweaks to the random drugs, added actual contraband to the
contraband crate. Maybe people will have a reason to buy it now, eh?
 2014-01-23 18:01:41 -05:00
Cluwnes Honk
6478e2e1d7 silent is broken as fuck 
Removes the message that checks if a mob is silent; silent is just plain broken.
 2014-01-23 10:34:41 -05:00
Cluwnes Honk
f54a35db72 Prevents mimes from using the megaphone. 
if(user.silent) didn't work. This is the next best thing.
 2014-01-23 10:34:03 -05:00
SamCroswell
a3a883444c Last minute tweaks 2014-01-22 23:12:50 -05:00
SamCroswell
fc4877b301 Added a few more drug names 2014-01-22 22:55:19 -05:00
SamCroswell
86ad8a5a17 Drugs/Minor CentComm Updates 2014-01-22 22:26:01 -05:00
John Smith
7a10f3c626 Black Baseball Caps [FIXED] 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/job_closets.dm
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
 2014-01-22 11:07:39 -05:00
Jesus Hussein Chris
95f7280781 Generic attack sounds for all melee weapons 
Overrides the generic sounds with more suitable ones where needed.
Weapons that do no damage don't have sound effects.

Conflicts:
	code/game/gamemodes/wizard/artefact.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/weapons/melee/misc.dm
	code/game/objects/items/weapons/storage/toolbox.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/objects/items/weapons/weaponry.dm
	code/game/objects/weapons.dm
	code/modules/hydroponics/hydroitemdefines.dm
	code/modules/surgery/tools.dm
 2014-01-22 10:15:43 -05:00
Rob Nelson
7892eeb7cc Standardize LASER, NOCLONE, and HUSK 
Conflicts:
	code/game/gamemodes/changeling/changeling_powers.dm
	code/modules/mob/living/carbon/human/death.dm
	maps/RandomZLevels/wildwest.dm
 2014-01-21 22:59:53 -05:00
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