cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-22 07:23:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,909 Commits 29 Branches 2 Tags
d1218e38bbff658eeb8d00c849ffb5eb48b6f98d
Commit Graph

1253 Commits

Author SHA1 Message Date
Rob Nelson
7832e1c26f PLASMA MAAAAAAAAAAAAAAAAAAAAAAAN 
Conflicts:
	.gitignore
	baystation12.dme
	code/_onclick/hud/screen_objects.dm
	code/modules/clothing/spacesuits/alien.dm
	code/modules/media/tapedeck.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/species.dm
	html/changelog.html
	icons/mob/back.dmi
	icons/mob/head.dmi
	icons/mob/in-hand/in-hand_sync_report.txt
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/tank.dmi
 2014-07-31 18:58:49 -04:00
ZomgPonies
03f116b8a4 Compile fix 2014-07-26 11:34:50 -04:00
DJSnapshot
b61a4d837f fix to allow non-humans to be stunned like they should be. Gosh. (Also, clumsy check and making harmbaton actually work) 
Conflicts:
	code/game/objects/items/weapons/stunbaton.dm
 2014-07-26 11:31:40 -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
ZomgPonies
6b0cee85b0 Spearbug 2014-07-23 15:50:33 -04:00
ZomgPonies
dc38069dd4 Merge pull request #319 from Bone-White/master 
Added secrets - bomb log for more explosives
 2014-07-23 14:45:25 -04:00
Bone White
d355956062 Added secrets - bomb log for more explosives 
Chem grenades, ghetto grenades and standard grenades added.  All log on
priming but not explosion.
 2014-07-23 19:02:47 +01:00
ZomgPonies
f2ecd1503b Completed adding Kidan Ambassador decorations 2014-07-23 13:24:51 -04:00
Whitellama
c231899b05 Eating with utensils now produces the eating sound, fixed #5687 2014-07-20 05:56:06 -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
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
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
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
b9be3e6ed7 Stops buckled mobs from slipping (for now) 
Conflicts:
	code/game/turfs/simulated.dm
 2014-07-13 06:48:17 -04:00
ZomgPonies
399e4909d6 The death of assistants. Long live civilians! 2014-06-27 17:57:18 -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
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
c11e6ae106 Adds suit cooling device 
Also:

Breathing in hot/cold air will affect your body temperature.
Fixes old body temperature stabilization code not working.
Thermometer icon now adjusts based on species.
Reduced BODYTEMP_AUTORECOVERY_MINIMUM to a less ridiculous value.

Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/clothing/spacesuits/ninja.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/mob/living/carbon/human/life.dm
 2014-06-21 17:23:30 -04:00
Necaladun
e138a3526f Combat knife 
Added combat knife
 2014-06-22 04:23:18 +09:30
ZomgPonies
0320b1a32e Fueltank explosions go to attack log 2014-06-20 16:26:27 -04:00
ZomgPonies
dedd110700 Send more stuff to attack log rather than admin log. 2014-06-20 13:42:42 -04:00
Chinsky
fc76ac01e0 Nextgen lighting #2: Lights 
Can paint light tubes and bulbs with paint and stick in sockets to get colored lights.
 2014-06-20 12:07:46 -04:00
Chinsky
3fa03af4cb Changes paint tile coloring to use color var, less icon procs. 2014-06-20 12:07:34 -04:00
Cael Aislinn
5439b04241 reconstitutor has a chance to extract multiple genomes per fossil (50% for two genomes, 37.5% chance for three genomes), moved xenoarchaeology initialisation code into the master controller, added upper and lower spawn vals for digsite turf number and artifact machine number, added circuitboards for the reconstitutors, fixes missing clonepod for flora reconstitutors 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>

Conflicts:
	code/global.dm
	code/modules/mining/mine_turfs.dm
	code/modules/research/xenoarchaeology/misc.dm
 2014-06-20 08:13:42 -04:00
mwerezak
3f6b32b15b Fixes #5186 2014-06-20 08:05:09 -04:00
Boop
f4cf6b3a0d Fix latex gloves box not having the right sprite 2014-06-18 22:15:34 -04:00
ZomgPonies
1132879810 Fixed up the stupid handcuff shit that's been bugging me forever. 2014-06-17 10:26:04 -04:00
ZomgPonies
22fa2cd3c4 Merge pull request #256 from Bone-White/master 
Space Law book link fix
 2014-06-17 07:54:38 -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
ZomgPonies
88920b7235 Runtime fix / removing extra testing messages 2014-06-17 00:16:59 -04:00
ZomgPonies
f84214533a Removing even more unneeded test messages 2014-06-17 00:06:53 -04:00
Bone White
619cf8899d Space Law book link fix 
Fixed the link in the Space Law book to correctly link to the printable
version of the space law page on the wiki.  Note that it uses Space_law
and not Space_Law on the wiki, as the font is smaller, but there are
some formatting errors on that page.  I can't edit the wiki page
directly to fix this because it's protected, but I wanted to keep the
smaller font to make it easier to read in game.
 2014-06-16 14:04:17 +01:00
ZomgPonies
692e7ef435 Fixing biting your own hand off 2014-06-14 23:18:12 -04:00
Loganbacca
083cd19c6a New vehicle framework 
- Implements a new vehicle framework
- Adds cargo trains

Conflicts:
	code/modules/mob/living/carbon/human/human.dm
 2014-06-14 22:14:53 -04:00
ZomgPonies
386b1b8307 Fixes a bunch more hurt -> harm checks 2014-06-14 01:02:29 -04:00
ZomgPonies
fb5265d1b1 You forgot 2 commas, NOW I'm annoyed :D 2014-06-09 01:23:12 -04:00
Michael Slettevold
0a1b0af8f7 Fixed lack of Zippo volume 2014-06-08 20:20:56 -07:00
Michael Slettevold
47ec7fc3f1 Fixed lack of Zippo volume 2014-06-08 20:19:33 -07:00
Michael Slettevold
a30cd63810 Added sound effect for opening and closing Zippo lighters. 
Corrected spelling of "independent", for flagprocs.dm.
 2014-06-08 20:14:33 -07:00
ZomgPonies
0d57c3ef4d Tune bag choking 2014-06-06 00:06:17 -04:00
ZomgPonies
4683a12a35 Fix for storage bags 2014-06-05 22:17:01 -04:00
ZomgPonies
caaf56dbcc Bugfix for bag choking 2014-06-05 17:09:27 -04:00
ZomgPonies
b9fe3ab514 Added choking people with plastic bags. 2014-06-05 04:43:30 -04:00
Hubblenaut
70d96aedde Makes crashing into things possible with extinguisher or harm intent 2014-06-03 18:46:52 -04:00
Zuhayr
31a1b6e526 Fixes #5098 
Conflicts:
	code/game/objects/items/weapons/tools.dm
	code/modules/power/cable.dm
 2014-06-01 13:29:18 -04:00
ChuckTheSheep
7491cd7b65 TC use count appears on round end 
Conflicts:
	code/datums/uplink_item.dm
	code/game/objects/items/devices/uplinks.dm

Adds Icons and purchase list

Conflicts:
	code/datums/uplink_item.dm
	code/game/gamemodes/traitor/traitor.dm
	code/stylesheet.dm

CSS is hard

Conflicts:
	code/game/gamemodes/traitor/traitor.dm

Mah Indents

Made Purchase Log Text rather than List

Conflicts:
	code/game/objects/items/devices/uplinks.dm

Moved images to top "survived" line

Conflicts:
	code/game/objects/items/devices/uplinks.dm

Boxes show contents

Nuke Ops Group Shaming

Conflicts:
	code/game/gamemodes/nuclear/nuclear.dm

Uses compiled list for uplinks

Conflicts:
	code/game/objects/items/devices/uplinks.dm
 2014-05-30 20:28:35 +02:00
ZomgPonies
06bbfcf150 Final Nations patch before live testing. This is going to be painful. 2014-05-27 20:09:10 -04:00