cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-05 23:21:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,306 Commits 26 Branches 2 Tags
2cd437ee5f1bbbf242df0ba2424ef12e2a587157
Commit Graph

1215 Commits

Author SHA1 Message Date
Fox-McCloud
53d15682ce Melee Rebalancing 2014-12-18 10:22:02 -05:00
Fox-McCloud
fd9d3edffb Cell Changes and other Stuff 2014-12-05 05:37:55 -05:00
Fox-McCloud
c218c1af3b Production and Mecha Tweaks 2014-12-03 18:20:51 -05:00
Markolie
8f47f50009 Fix stun batons and holographic sign projectors 2014-11-19 20:20:10 +01:00
Markolie
876a5067a0 Adds constructable and upgradeable machinery, fixes the RPED, other minor fixes 2014-11-17 08:32:39 +01:00
Fox-McCloud
111b24ceb8 Janitor Rework 2014-11-10 03:17:56 -05:00
Fox-McCloud
dd200af4bf Nuke Ops Rework Phase 2 2014-11-05 06:56:46 -05:00
GinjaNinja32
0427641d89 Moved all shard code to one file. Fixed #5992 
Conflicts:
	code/defines/obj/weapon.dm
	code/game/objects/items/stacks/sheets/glass.dm
 2014-08-16 21:43:38 -04:00
ZomgPonies
99c96c0c9c Let's stay up to date with Zuzu's PR shall we? 2014-07-26 12:04:54 -04:00
Zuhayr
ebb9f724aa Hydroponics rewrite, details will be in PR. Big commit. 
Conflicts:
	baystation12.dme
	code/controllers/master_controller.dm
	code/game/gamemodes/events/spacevines.dm
	code/game/machinery/seed_extractor.dm
	code/modules/mob/living/carbon/brain/posibrain.dm
	code/modules/mob/mob.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/food/snacks/grown.dm
	icons/obj/hydroponics.dmi
	maps/tgstation2.dmm
 2014-07-25 11:10:01 -04:00
Zuhayr
13797e99ed New machines, adjusted Cael's seeds, rewrote space vines. 
Conflicts:
	code/defines/obj/hydro.dm
	code/game/machinery/hydroponics.dm
	code/modules/hydroponics/grown_inedible.dm
	code/modules/hydroponics/hydroitemdefines.dm
 2014-07-25 10:06:19 -04:00
ZomgPonies
f2ecd1503b Completed adding Kidan Ambassador decorations 2014-07-23 13:24:51 -04:00
PsiOmega
cda07c694d Deluxe soap now has a more pleasant range of smells. 2014-07-18 07:05: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
Chinsky
1d2fb1491f Adds 3 office clutter items. 
Conflicts:
	code/defines/obj/weapon.dm
 2014-06-20 12:11:13 -04:00
mwerezak
6ada0cf263 Adds sharp and edge flags to appropriate items 
Went through as many /obj/item/weapons as I could find and added sharp
and edge flags where appropriate.

Conflicts:
	code/modules/research/xenoarchaeology/finds/finds_misc.dm
 2014-06-17 07:08:25 -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
GhostAA12
81c000f0cf Fixes the Rapid Parts Exchange device 
Previously did nothing because of missing proc on machinery
 2014-06-14 11:41:18 -07:00
AlexanderSeto
57e8d921ff Recommits storage 2014-06-12 16:28:19 -07:00
ZomgPonies
4f1140c115 Fix some seed issues? 2014-06-01 21:54:28 -04:00
AlexanderSeto
586e9633f1 Adds the rapid part exchange device 2014-05-24 08:56:51 -07:00
jack-fractal
3df35fe03c modifying visibility interface of ai to use generic visibility_interface 
Conflicts:
	baystation12.dme
	code/game/gamemodes/malfunction/Malf_Modules.dm
	code/modules/mob/living/silicon/ai/freelook/cameranet.dm
	code/modules/mob/living/silicon/ai/freelook/chunk.dm
	code/modules/mob/living/silicon/ai/freelook/eye.dm
	code/modules/mob/living/silicon/ai/freelook/update_triggers.dm
 2014-05-15 04:43:49 -04: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
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
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
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
ZomgPonies
2a50c9d0c6 Gamma level nuke ops fixes 2014-01-04 03:37:55 -05:00
ZomgPonies
c2f28f1da3 Grow fix 2013-11-27 18:02:12 -05:00
ZomgPonies
6467bbbb39 Added growing and rolling your own weed, tobacco, tea, coffee 2013-11-27 16:51:04 -05:00
ZomgPonies
3273ab1418 Econ and hud fixes 2013-11-25 06:12:56 -05:00
Fox-McCloud
91026fba82 Hydro+Xenoarch+Sprites 
Few changes to Xenoarch finds, adds hydroponics plants, updates a couple
sprites, and removes NT Rep from various traitor lists.
 2013-11-01 23:46:37 -04:00
ZomgPonies
2c0614d3af Replaces HasEntered() with Crossed() and reduces redundant checks on turf/Enter() 2013-10-28 06:45:15 -04:00
ZomgPonies
5daf979b72 Pretty much all new click code 2013-10-12 14:44:36 -04:00
ZomgPonies
b0aff645a3 Massive traitor item overhaul 2013-09-23 05:41:53 -04:00
ZomgPonies
70befa9e2a Bike horns honks on hit 2013-08-20 02:49:18 -04:00
Zuhayr
50d0c18165 Added a knife harness/duelling knives. 2013-08-08 20:48:54 -07:00
Zuhayr
486f46d71e Moved around podmen code, adjusted a lot of strings, rewrote/modified a lot of the podman generation code, added podman icons, commented out potato person green tint. 2013-07-31 04:17:17 -07:00
Zuhayr
7cd54ac387 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-06-12 11:41:08 -07:00
Zuhayr
19748b1217 Added verbs for ripping items out of yourself, added examine proc, altered hatchets w_class. 2013-06-12 03:20:23 -07:00
Zuhayr
7db6cd4108 Added shrapnel from projectile wounds and altered scanner readout. 2013-06-12 01:45:07 -07:00
Zuhayr
0a220db976 Added embedded weapons and adjusted implant removal surgery to work with non-implants in organs. 2013-06-12 00:28:12 -07:00
Chinsky
bd3879da2e Merge pull request #3040 from Baystation12/master 
hurka durka master update
 2013-06-11 12:25:56 -07:00
Furlucis
360bde9f83 Fixed some typos. (feotal, "/red ...") 
Signed-off-by: Furlucis <Logman115@gmail.com>
 2013-06-11 15:01:48 -04:00
Zuhayr
98d31e9191 Preliminary work for pneumatic cannons (WIP, no sprites, broken gun) 2013-06-10 22:35:01 -07:00
NerdyBoy1104
390029007d Added Rice and Plastellium plants. Rice stalks are grinded into rice that you can make boiled rice, rice pudding and Sake from. Plastellium is refined into plastic by grinding it into plasticide. 20 plasticide + 10 poly acid makes 10 sheets of platic which can be used to make crates, forks, spoons, knives, ashtrays or plastic bags from. 2013-04-23 22:52:08 +01:00
Cael_Aislinn
7f05c6fdb3 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/game/jobs/job/captain.dm
	code/game/jobs/job/security.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/mob/living/carbon/human/hud.dm
	html/changelog.html
	icons/obj/items.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-23 01:02:27 +10:00
Cael_Aislinn
104bc8dd98 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/datums/supplypacks.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/security.dm
	code/modules/clothing/spacesuits/rig.dm
	icons/mob/head.dmi
	icons/mob/suit.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-23 00:48:07 +10:00
Cael_Aislinn
bb5a349fcf Merge branch 'incremental_tg' r5600 into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/__HELPERS/global_lists.dm
	code/controllers/master_controller.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/gamemodes/wizard/rightandwrong.dm
	code/game/hud.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/job.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/science.dm
	code/game/jobs/job/security.dm
	code/game/machinery/computer/cloning.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/weapons/gift_wrappaper.dm
	code/game/objects/items/weapons/implants/implantnanoaug.dm
	code/game/objects/items/weapons/storage/uplink_kits.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/turfs/turf.dm
	code/modules/client/client defines.dm
	code/modules/client/client procs.dm
	code/modules/clothing/masks/miscellaneous.dm
	code/modules/clothing/shoes/miscellaneous.dm
	code/modules/clothing/under/ties.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/silicon/say.dm
	code/modules/mob/mob_defines.dm
	code/modules/paperwork/clipboard.dm
	code/modules/paperwork/pen.dm
	code/modules/paperwork/stamps.dm
	code/modules/projectiles/projectile.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/setup.dm
	config/config.txt
	html/changelog.html
	icons/effects/effects.dmi
	icons/mob/feet.dmi
	icons/mob/head.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/mask.dmi
	icons/mob/suit.dmi
	icons/mob/ties.dmi
	icons/mob/uniform.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/masks.dmi
	icons/obj/clothing/shoes.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/clothing/ties.dmi
	maps/tgstation.2.1.0.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-23 00:23:37 +10:00
Cael_Aislinn
0c2c999f74 money! re-added atms, created account system / accounts database, whole bunch of options for moving money around, some tweaks to spacecash and icons 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-22 17:56:34 +10:00
d_h2005@yahoo.com
e15c63d100 -New chicken sprites! Other minor tweaks to chicken code, slows them down some and notches the lay rate back a bit. 
-Fixes invisible cane inhands.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5595 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-21 06:02:30 +00:00