cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-26 01:11:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,219 Commits 28 Branches 2 Tags
da35e2b677f463fbbfef0bafda5be3aa55ebd90b
Commit Graph

1276 Commits

Author SHA1 Message Date
Fox-McCloud
8c1f6431e6 Tweaks and Fixes and Major Map Changed 
More Info will be posted directly, later.
 2014-10-13 22:00:07 -04:00
Fox-McCloud
9c8326e120 Fix, Tweak, and Revise 
fixes a few non-functioning things, adds in a few new features,
basically the previous patch minus "controversial" stuff.
 2014-09-29 02:10:28 -04:00
melandor0
7ff72c38cd nanotrasen.se 
Replaces 80.244.78.90 with nanotrasen.se in the code.
 2014-09-04 19:45:43 +02:00
melandor0
59f73acfd3 Traitorstation Fixes + SyndieCat 
Fixes some things with traitorstation and adds SyndieCat.
 2014-09-02 13:53:11 +02:00
ZomgPonies
f4b6450a20 Merge pull request #398 from VampyrBytes/master 
IPC and nuke disk fixes
 2014-08-20 03:07:01 -04:00
VampyrBytes
5b8253fb57 IPC and nuke disk fixes 
Fix for IPC revival
Prevents nuke disk from being inserted via cavity surgery
 2014-08-19 07:06:12 +01:00
ZomgPonies
ed484b68aa Compile fix 2014-08-16 21:45:36 -04:00
GinjaNinja32
bf3d3cf04a Use absolute paths 2014-08-16 21:44:27 -04:00
GinjaNinja32
52b0de9928 Use \the macro 2014-08-16 21:44:10 -04: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
Ccomp5950
3ca02d3c5b Fixed the font tag on mouse traps description. 
Conflicts:
	code/game/objects/items/weapons/storage/boxes.dm
 2014-08-16 20:53:29 -04:00
Artorp
4c59644d95 Enable medical belt quick pickup 
Using a medical belt on a bottle will attempt to pick up all bottles on
the tile.
 2014-08-09 02:51:15 +02:00
ZomgPonies
509af0b236 Stun revolver rebalance. 25% more powerful than regular taser. Lost it's insta-stun 2014-08-04 01:54:27 -04:00
mwerezak
c22ea7a5c0 Fixes some handcuff oversights 
You now don't need to be grabbing to put handcuffs on yourself, and you
can now put hancuffs on if your grab state is higher than aggressive.
 2014-08-03 16:15:47 -04:00
mwerezak
2c7926eff8 Stunbaton fixes and cleanup 
Apparently harm intent is "hurt", not "harm"

Conflicts:
	code/game/objects/items/weapons/stunbaton.dm
 2014-08-03 16:09:38 -04:00
mwerezak
3eae360963 Handcuffs now require an aggressive grab 
Conflicts:
	code/game/objects/items/weapons/handcuffs.dm
 2014-08-03 16:07:35 -04:00
mwerezak
279718728f Allows the use of stun weapons to show up in autopsies 
Conflicts:
	code/game/objects/items/weapons/stunbaton.dm
	code/modules/mob/living/carbon/human/human_defense.dm
 2014-08-03 16:00:48 -04:00
mwerezak
f43a3ead70 Merges taser and stun baton effects 
Makes the code for handling stun weapon effects much cleaner.
Moves electrocute_act and emp_act from living.dm into living_defense.dm

Conflicts:
	code/game/objects/items/weapons/stunbaton.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/living.dm
 2014-08-03 15:59:21 -04:00
mwerezak
64638987dc Adds siemens_coefficient handling to stun batons 
Conflicts:
	code/game/objects/items/weapons/stunbaton.dm
 2014-08-03 15:54:34 -04:00
ZomgPonies
f2f1b53791 Meh 2014-08-03 15:48:09 -04:00
mwerezak
ac0e3966d6 Taser cleanup and fixes 
Fixes cloaking devices and deadman switches being included in taser code
somehow.

Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
 2014-08-03 15:47:21 -04:00
ZomgPonies
fef301062e Boop 2014-08-03 15:42:27 -04:00
mwerezak
0dc07bafa1 Stun baton nerf 
Adds agonyforce var to stun batons, which causes halloss and eye blur.

Also did some clean up of stun batons, and fixed the stun baton's bcell
var being of type weapon/cell/high instead of weapon/cell.

Conflicts:
	code/_onclick/item_attack.dm
	code/game/objects/items/weapons/stunbaton.dm
 2014-08-03 15:40:19 -04:00
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